summaryrefslogtreecommitdiff
path: root/Propellor.hs
diff options
context:
space:
mode:
authorJoey Hess2014-03-30 16:15:27 -0400
committerJoey Hess2014-03-30 16:15:27 -0400
commitaf5e56ff242f2683be683918fc6d4266f2fc0f87 (patch)
treef1843a5039566b384e2141f7ef8d84d48bd0c14c /Propellor.hs
parentafb7afee0ce011754e60f313b6929d1eadfcc701 (diff)
tweaks
Diffstat (limited to 'Propellor.hs')
-rw-r--r--Propellor.hs12
1 files changed, 8 insertions, 4 deletions
diff --git a/Propellor.hs b/Propellor.hs
index f8d0e717..b3c668d9 100644
--- a/Propellor.hs
+++ b/Propellor.hs
@@ -19,17 +19,20 @@ getProperties :: HostName -> [Property]
getProperties hostname@"clam.kitenet.net" =
[ cleanCloudAtCost hostname
, standardSystem Apt.Unstable
+ -- Clam is a tor bridge.
+ , Tor.isBridge
-- This is not an important system so I don't want to need to
-- manually upgrade it.
, Apt.unattendedUpgrades True
- -- Clam is a tor bridge.
- , Tor.isBridge
-- Should come last as it reboots.
, Apt.installed ["systemd-sysv"] `onChange` Reboot.now
]
-- add more hosts here...
--getProperties "foo" =
-getProperties h = error $ "Unknown host: " ++ h ++ " (perhaps you should specify the real hostname on the command line?)"
+getProperties h = error $ unwords
+ [ "Unknown host:", h
+ , "(perhaps you should specify the real hostname on the command line?)"
+ ]
-- This is my standard system setup
standardSystem :: Apt.Suite -> Property
@@ -51,13 +54,14 @@ standardSystem suite = propertyList "standard system"
, "/etc/sudoers" `File.containsLine` "joey ALL=(ALL:ALL) NOPASSWD:ALL"
`describe` "sudoer joey"
, GitHome.installedFor "joey"
+ -- I use postfix, or no MTA.
+ , Apt.removed ["exim4"] `onChange` Apt.autoRemove
]
-- Clean up a system as installed by cloudatcost.com
cleanCloudAtCost :: HostName -> Property
cleanCloudAtCost hostname = propertyList "cloudatcost cleanup"
[ User.nuked "user"
- , Apt.removed ["exim4"] `onChange` Apt.autoRemove
, Hostname.set hostname
, Ssh.uniqueHostKeys
, "/etc/default/grub" `File.containsLine` "GRUB_DISABLE_LINUX_UUID=true"