diff options
author | Jesse Luehrs <doy@tozt.net> | 2018-12-07 00:33:38 -0500 |
---|---|---|
committer | Jesse Luehrs <doy@tozt.net> | 2018-12-07 00:33:38 -0500 |
commit | 0329feb4fc28bda05c164880b6ab948970b9b10f (patch) | |
tree | aec3760b2810479678fea6bde2ea397cd3206893 | |
parent | db1d1eff41eb2cd36ae11b04de185d38d7063605 (diff) | |
download | puppet-tozt-0329feb4fc28bda05c164880b6ab948970b9b10f.tar.gz puppet-tozt-0329feb4fc28bda05c164880b6ab948970b9b10f.zip |
fix mirrorlist ordering
-rw-r--r-- | manifests/mail.pp | 4 | ||||
-rw-r--r-- | manifests/partofme.pp | 4 | ||||
-rw-r--r-- | manifests/tozt.pp | 4 | ||||
-rw-r--r-- | modules/mail/manifests/operatingsystem.pp | 1 | ||||
-rw-r--r-- | modules/partofme/manifests/operatingsystem.pp | 1 | ||||
-rw-r--r-- | modules/tozt/manifests/operatingsystem.pp | 1 |
6 files changed, 9 insertions, 6 deletions
diff --git a/manifests/mail.pp b/manifests/mail.pp index d47c328..a9a055c 100644 --- a/manifests/mail.pp +++ b/manifests/mail.pp @@ -5,9 +5,11 @@ node 'mail', 'mail.localdomain' { include base + include mail::operatingsystem + Class['mail::operatingsystem'] -> Package<| provider == "pacman" |> + # XXX # include mail::backups include mail::mailu - include mail::operatingsystem include mail::services } diff --git a/manifests/partofme.pp b/manifests/partofme.pp index 22ebfbe..a8056f1 100644 --- a/manifests/partofme.pp +++ b/manifests/partofme.pp @@ -6,10 +6,12 @@ node 'partofme', 'partofme.localdomain' { include base + include partofme::operatingsystem + Class['partofme::operatingsystem'] -> Package<| provider == "pacman" |> + include partofme::backups include partofme::filesharing include partofme::mdadm include partofme::monitoring - include partofme::operatingsystem include partofme::persistent } diff --git a/manifests/tozt.pp b/manifests/tozt.pp index e96c922..cf84b6c 100644 --- a/manifests/tozt.pp +++ b/manifests/tozt.pp @@ -5,9 +5,11 @@ node 'tozt', 'tozt.localdomain' { include base + include tozt::operatingsystem + Class['tozt::operatingsystem'] -> Package<| provider == "pacman" |> + include tozt::backups include tozt::git - include tozt::operatingsystem include tozt::pass include tozt::paste include tozt::services diff --git a/modules/mail/manifests/operatingsystem.pp b/modules/mail/manifests/operatingsystem.pp index 3e61b14..a9bd1de 100644 --- a/modules/mail/manifests/operatingsystem.pp +++ b/modules/mail/manifests/operatingsystem.pp @@ -2,5 +2,4 @@ class mail::operatingsystem { file { '/etc/pacman.d/mirrorlist': source => 'puppet:///modules/mail/mirrorlist'; } - File['/etc/pacman.d/mirrorlist'] -> Package<| provider == "pacman" |> } diff --git a/modules/partofme/manifests/operatingsystem.pp b/modules/partofme/manifests/operatingsystem.pp index 7e175f2..087ddcd 100644 --- a/modules/partofme/manifests/operatingsystem.pp +++ b/modules/partofme/manifests/operatingsystem.pp @@ -6,7 +6,6 @@ class partofme::operatingsystem { '/etc/pacman.d/mirrorlist': source => 'puppet:///modules/partofme/mirrorlist'; } - File['/etc/pacman.d/mirrorlist'] -> Package<| provider == "pacman" |> exec { '/usr/bin/mkinitcpio -p linux': refreshonly => true; diff --git a/modules/tozt/manifests/operatingsystem.pp b/modules/tozt/manifests/operatingsystem.pp index f5da5bb..4d4ab53 100644 --- a/modules/tozt/manifests/operatingsystem.pp +++ b/modules/tozt/manifests/operatingsystem.pp @@ -2,5 +2,4 @@ class tozt::operatingsystem { file { '/etc/pacman.d/mirrorlist': source => 'puppet:///modules/tozt/mirrorlist'; } - File['/etc/pacman.d/mirrorlist'] -> Package<| provider == "pacman" |> } |