diff options
| author | Joey Hess <joey@kitenet.net> | 2014-04-03 23:13:05 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-03 23:13:05 -0400 |
| commit | 8868b4401057bb6152f628cacff261f9353335cd (patch) | |
| tree | 24f511a1174dbda79d4796d8da12b9596dad6ed6 | |
| parent | 869d4ab198a21579daafbf183bcbe84edfdaa1a8 (diff) | |
propellor spin
| -rw-r--r-- | config-joeyh.hs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/config-joeyh.hs b/config-joeyh.hs index cb56f4b2..aa0669c7 100644 --- a/config-joeyh.hs +++ b/config-joeyh.hs @@ -85,7 +85,7 @@ image _ = "debian" -- This is my standard system setup standardSystem :: DebianSuite -> [Property] -> Maybe [Property] standardSystem suite customprops = Just $ - standardprops : customprops ++ [endprops] + standardprops : customprops ++ endprops where standardprops = propertyList "standard system" $ props & Apt.stdSourcesList suite `onChange` Apt.upgrade @@ -104,9 +104,11 @@ standardSystem suite customprops = Just $ & Apt.installed ["vim", "screen", "less"] & Cron.runPropellor "30 * * * *" -- I use postfix, or no MTA. - & Apt.removed ["exim4"] `onChange` Apt.autoRemove - -- May reboot, so comes last. - endprops = Apt.installed ["systemd-sysv"] `onChange` Reboot.now + & Apt.removed ["exim4", "exim4-daemon-light", "exim4-config", "exim4-base"] + `onChange` Apt.autoRemove + -- May reboot, so comes last + -- Currently not enable due to #726375 + endprops = [] -- [Apt.installed ["systemd-sysv"] `onChange` Reboot.now] -- Clean up a system as installed by cloudatcost.com cleanCloudAtCost :: HostName -> Property |