diff options
-rw-r--r-- | manifests/tozt.pp | 13 | ||||
-rw-r--r-- | modules/base/manifests/init.pp | 3 | ||||
-rw-r--r-- | modules/base/manifests/makepkg.pp | 7 |
3 files changed, 11 insertions, 12 deletions
diff --git a/manifests/tozt.pp b/manifests/tozt.pp index ec5b4b8..c0e6793 100644 --- a/manifests/tozt.pp +++ b/manifests/tozt.pp @@ -1,11 +1,20 @@ node 'tozt.localdomain' { + $default_user = 'doy' + $persistent_data = '/media/persistent' + include tozt::persistent class { 'base': - default_user => 'doy', - persistent_data => '/media/persistent', + default_user => $default_user, + persistent_data => $persistent_data, } Class['tozt::persistent'] -> Class['base'] + Package::Makepkg { + build_user => $default_user, + } + + Base::User[$default_user] -> Package::Makepkg<| build_user == $default_user |> + include tozt::backups include tozt::git include tozt::pass diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp index c9e477d..7e3450e 100644 --- a/modules/base/manifests/init.pp +++ b/modules/base/manifests/init.pp @@ -8,7 +8,4 @@ class base($default_user, $persistent_data) { default_user => $default_user, persistent_data => $persistent_data; } - class { 'base::makepkg': - default_user => $default_user; - } } diff --git a/modules/base/manifests/makepkg.pp b/modules/base/manifests/makepkg.pp deleted file mode 100644 index 0d725a2..0000000 --- a/modules/base/manifests/makepkg.pp +++ /dev/null @@ -1,7 +0,0 @@ -class base::makepkg($default_user) { - Package::Makepkg { - build_user => $default_user, - } - - Base::User[$default_user] -> Package::Makepkg<| build_user == $default_user |> -} |