diff options
| author | Joey Hess <joey@kitenet.net> | 2014-03-30 23:02:10 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-03-30 23:02:10 -0400 |
| commit | 02a7bf5f0e2de1d0dea71781ed0c1ae3a50e6425 (patch) | |
| tree | 7900cf0f30f2d27b9d79ae6fc561b79dc308feaa /Propellor.hs | |
| parent | 647e1a6de21176625e1844c6b3838ffca8dca70e (diff) | |
tweak
Diffstat (limited to 'Propellor.hs')
| -rw-r--r-- | Propellor.hs | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Propellor.hs b/Propellor.hs index 7a9e1451..58d8289d 100644 --- a/Propellor.hs +++ b/Propellor.hs @@ -19,13 +19,13 @@ main = defaultMain getProperties {- This is where the system's HostName, either as returned by uname - or one specified on the command line, is converted into a list of - Properties for that system. -} -getProperties :: HostName -> [Property] -getProperties hostname@"clam.kitenet.net" = +getProperties :: HostName -> Maybe [Property] +getProperties hostname@"clam.kitenet.net" = Just [ cleanCloudAtCost hostname , standardSystem Apt.Unstable + , Network.ipv6to4 -- Clam is a tor bridge, and an olduse.net shellbox. , Tor.isBridge - , Network.ipv6to4 , JoeySites.oldUseNetshellBox -- I play with docker on clam. , Docker.configured @@ -37,10 +37,7 @@ getProperties hostname@"clam.kitenet.net" = ] -- add more hosts here... --getProperties "foo" = -getProperties h = error $ unwords - [ "Unknown host:", h - , "(perhaps you should specify the real hostname on the command line?)" - ] +getProperties _ = Nothing -- This is my standard system setup standardSystem :: Apt.Suite -> Property |