From 2617c557ba759bfe6b34803cbb54e0739bfbe506 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Sat, 12 Aug 2017 14:01:40 +0100
Subject: [PATCH] Split packages

---
 modules/yaourt/manifests/init.pp     |  8 +++-----
 modules/yaourt/manifests/keys.pp     | 15 +++++++++++++++
 modules/yaourt/manifests/packages.pp |  7 +++++++
 3 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 modules/yaourt/manifests/keys.pp
 create mode 100644 modules/yaourt/manifests/packages.pp

diff --git a/modules/yaourt/manifests/init.pp b/modules/yaourt/manifests/init.pp
index 7f1b32d..47b70d7 100644
--- a/modules/yaourt/manifests/init.pp
+++ b/modules/yaourt/manifests/init.pp
@@ -1,7 +1,5 @@
 class yaourt {
-  package {[
-    "firefox-beta"
-  ]:
-    ensure => latest
-  }
+  include 'yaourt::packages'
+
+  include 'yaourt::keys'
 }
diff --git a/modules/yaourt/manifests/keys.pp b/modules/yaourt/manifests/keys.pp
new file mode 100644
index 0000000..e30903f
--- /dev/null
+++ b/modules/yaourt/manifests/keys.pp
@@ -0,0 +1,15 @@
+class yaourt::keys () {
+  exec { '/usr/bin/gpg --recv-keys F7E48EDB':
+    user => 'jake'
+  }
+
+  exec { '/usr/bin/pacman-key -r 962DDE58':
+  }
+
+  exec { '/usr/bin/pacman-key --lsign-key 962DDE58':
+  }
+
+  exec { '/usr/bin/gpg --keyserver pool.sks-keyservers.net --recv-keys 2E1AC68ED40814E0':
+    user => 'jake'
+  }
+}
diff --git a/modules/yaourt/manifests/packages.pp b/modules/yaourt/manifests/packages.pp
new file mode 100644
index 0000000..741a9c1
--- /dev/null
+++ b/modules/yaourt/manifests/packages.pp
@@ -0,0 +1,7 @@
+class yaourt::packages () {
+  package {[
+    'firefox'
+  ]:
+    ensure => latest
+  }
+}