From 29366f15a19cc914d47beb9a023ff1b96c6e6e91 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sun, 15 Oct 2017 20:38:56 +0100 Subject: [PATCH] Install packages in seperate command --- deploy.sh | 6 ++++-- {modules/yaourt/manifests => manifests}/packages.pp | 2 +- modules/yaourt/manifests/init.pp | 2 -- 3 files changed, 5 insertions(+), 5 deletions(-) rename {modules/yaourt/manifests => manifests}/packages.pp (98%) diff --git a/deploy.sh b/deploy.sh index ab755e6..1663f8c 100755 --- a/deploy.sh +++ b/deploy.sh @@ -2,8 +2,10 @@ set -e -patch /usr/bin/makepkg -N < makepkg.patch - puppet apply manifests/main.pp --modulepath=modules/ --verbose +patch /usr/bin/makepkg -N < makepkg.patch + +puppet apply manifests/packages.pp --modulepath=modules/ --verbose + patch /usr/bin/makepkg -NR < makepkg.patch diff --git a/modules/yaourt/manifests/packages.pp b/manifests/packages.pp similarity index 98% rename from modules/yaourt/manifests/packages.pp rename to manifests/packages.pp index da09eff..831754f 100644 --- a/modules/yaourt/manifests/packages.pp +++ b/manifests/packages.pp @@ -1,4 +1,4 @@ -class yaourt::packages () { +node default { package {[ 'acpi', 'advanced-ssh-config', diff --git a/modules/yaourt/manifests/init.pp b/modules/yaourt/manifests/init.pp index 9930514..6ae7ffd 100644 --- a/modules/yaourt/manifests/init.pp +++ b/modules/yaourt/manifests/init.pp @@ -1,7 +1,5 @@ class yaourt { include 'yaourt::files' - include 'yaourt::packages'; - include 'yaourt::keys' }