From b21feb9e8d82f17fb7445379cda2f57e2eae8213 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 8 Sep 2014 10:56:08 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/Propellor/Property/SiteSpecific/JoeySites.hs') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 6fe10c02..f0ce106a 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -545,6 +545,8 @@ kiteMailServer = propertyList "kitenet.net mail server" [ "inbox-path={localhost/novalidate-cert}inbox" ] `describe` "pine configured to use local imap server" + + , Apt.serviceInstalledRunning "mailman" ] where ctx = Context "kitenet.net" -- cgit v1.3-2-g0d8e From 0126c41a5315ad5dfa95b358ab7786638ebc1723 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 8 Sep 2014 12:46:54 -0400 Subject: propellor spin --- config-joey.hs | 8 ++++---- src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/Propellor/Property/SiteSpecific/JoeySites.hs') diff --git a/config-joey.hs b/config-joey.hs index 6b99f0f5..c4c90ced 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -413,7 +413,7 @@ monsters = -- but do want to track their public keys etc. - mail - /postfix - /postgrey - - mailman + - /mailman - /spamassassin - sqwebmail (cannot use this with dovecot, alternatives?) - /imap server @@ -438,12 +438,12 @@ monsters = -- but do want to track their public keys etc. - / switch kitenet.net dns and enable pop.kitenet.net etc aliass - / point wren.kitenet.net at kite.kitenet.net temporarily - / (make old.kitenet.net alias) - - - reconfigure errol's email client to use new server + - / reconfigure errol's email client to use new server - / on darkstar: re-run offlinimap against new server - - - test mail (blocked on dns propigation) + - - test sending mail (blocked on dns propigation) - - test virus filtering - / test http://kitenet.net/~kyle/ (user home dirs) - - - test mailman + - / test mailman - / migrate user cron jobs -} , host "mouse.kitenet.net" diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index f0ce106a..4eb6d477 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -482,7 +482,7 @@ kiteMailServer = propertyList "kitenet.net mail server" , "header_checks = pcre:$config_directory/obscure_client_relay.pcre" , "# Enable postgrey." - , "smtpd_recipient_restrictions = permit_mynetworks,reject_unauth_destination,check_policy_service inet:127.0.0.1:10023" + , "smtpd_recipient_restrictions = permit_tls_clientcerts,permit_mynetworks,reject_unauth_destination,check_policy_service inet:127.0.0.1:10023" , "# Enable spamass-milter and amavis-milter." , "smtpd_milters = unix:/spamass/spamass.sock unix:amavis/amavis.sock" -- cgit v1.3-2-g0d8e From f2bdab547e2b49eace86ff86e9db84f8ae8b9836 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 8 Sep 2014 15:18:42 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/Propellor/Property/SiteSpecific/JoeySites.hs') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 4eb6d477..0b3e5f8a 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -452,6 +452,8 @@ kiteMailServer = propertyList "kitenet.net mail server" ] `onChange` Postfix.reloaded `describe` "postfix mydomain file configured" + , addDNS (MX 0 $ AbsDomain "joeyh.name") + , addDNS (MX 0 $ AbsDomain "ikiwiki.info") , "/etc/postfix/obscure_client_relay.pcre" `File.containsLine` "/^Received: from ([^.]+)\\.kitenet\\.net.*using TLS.*by kitenet\\.net \\(([^)]+)\\) with (E?SMTPS?A?) id ([A-F[:digit:]]+)(.*)/ IGNORE" `onChange` Postfix.reloaded -- cgit v1.3-2-g0d8e From 599168ddcbffe6ab3b12b9d01e91b0c51e6c3bd5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 8 Sep 2014 15:20:53 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/Propellor/Property/SiteSpecific/JoeySites.hs') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 0b3e5f8a..4eb6d477 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -452,8 +452,6 @@ kiteMailServer = propertyList "kitenet.net mail server" ] `onChange` Postfix.reloaded `describe` "postfix mydomain file configured" - , addDNS (MX 0 $ AbsDomain "joeyh.name") - , addDNS (MX 0 $ AbsDomain "ikiwiki.info") , "/etc/postfix/obscure_client_relay.pcre" `File.containsLine` "/^Received: from ([^.]+)\\.kitenet\\.net.*using TLS.*by kitenet\\.net \\(([^)]+)\\) with (E?SMTPS?A?) id ([A-F[:digit:]]+)(.*)/ IGNORE" `onChange` Postfix.reloaded -- cgit v1.3-2-g0d8e From d8367de73a6c3df75a5ccd8d783ff48adf1cf7be Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 10 Sep 2014 22:56:42 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/Propellor/Property/SiteSpecific/JoeySites.hs') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 4eb6d477..e90265e8 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -541,8 +541,9 @@ kiteMailServer = propertyList "kitenet.net mail server" `onChange` (pinescript `File.mode` combineModes (readModes ++ executeModes)) `describe` "pine wrapper script" - , "/etc/pine.conf" `File.containsLines` - [ "inbox-path={localhost/novalidate-cert}inbox" + , "/etc/pine.conf" `File.hasContent` + [ "# deployed with propellor" + , "inbox-path={localhost/novalidate-cert/NoRsh}inbox" ] `describe` "pine configured to use local imap server" -- cgit v1.3-2-g0d8e From acd46384939d2bd8ea4a7190193306e60a471513 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 10 Sep 2014 23:01:19 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Propellor/Property/SiteSpecific/JoeySites.hs') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index e90265e8..0a8c01b3 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -708,8 +708,8 @@ legacyWebSites = propertyList "legacy web sites" ] , alias "joey.kitenet.net" , toProp $ Apache.siteEnabled "joey.kitenet.net" $ apachecfg "joey.kitenet.net" False - [ "DocumentRoot /home/joey/html" - , "" + [ "DocumentRoot /var/www" + , "" , " Options Indexes ExecCGI" , " AllowOverride None" , Apache.allowAll -- cgit v1.3-2-g0d8e From ffe36b68b4699ebde5f8fc3badcc2ace90255f32 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 24 Sep 2014 11:18:12 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/Propellor/Property/SiteSpecific/JoeySites.hs') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 0a8c01b3..caf839dd 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -452,8 +452,16 @@ kiteMailServer = propertyList "kitenet.net mail server" ] `onChange` Postfix.reloaded `describe` "postfix mydomain file configured" - , "/etc/postfix/obscure_client_relay.pcre" `File.containsLine` - "/^Received: from ([^.]+)\\.kitenet\\.net.*using TLS.*by kitenet\\.net \\(([^)]+)\\) with (E?SMTPS?A?) id ([A-F[:digit:]]+)(.*)/ IGNORE" + , "/etc/postfix/obscure_client_relay.pcre" `File.containsLines` + -- Remove received lines for mails relayed from trusted + -- clients. These can be a privacy vilation, or trigger + -- spam filters. + [ "/^Received: from ([^.]+)\\.kitenet\\.net.*using TLS.*by kitenet\\.net \\(([^)]+)\\) with (E?SMTPS?A?) id ([A-F[:digit:]]+)(.*)/ IGNORE" + -- Remove local Received line for postfix running on a + -- trusted client that relays through. These can trigger + -- spam filters. + , "/^Received: by ([^.]+)\\.kitenet\\.net.*from userid.*/ IGNORE" + ] `onChange` Postfix.reloaded `describe` "postfix obscure_client_relay file configured" , Postfix.mappedFile "/etc/postfix/virtual" -- cgit v1.3-2-g0d8e From 3fe6e0f8bdc1915bbe9322ffa07f9349c8333d70 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 24 Sep 2014 11:21:12 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Propellor/Property/SiteSpecific/JoeySites.hs') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index caf839dd..863a86cf 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -460,7 +460,7 @@ kiteMailServer = propertyList "kitenet.net mail server" -- Remove local Received line for postfix running on a -- trusted client that relays through. These can trigger -- spam filters. - , "/^Received: by ([^.]+)\\.kitenet\\.net.*from userid.*/ IGNORE" + -- , "/^Received: by ([^.]+)\\.kitenet\\.net.*from userid.*/ IGNORE" ] `onChange` Postfix.reloaded `describe` "postfix obscure_client_relay file configured" -- cgit v1.3-2-g0d8e From d1292a578643668973d3ba9352d24d6fb6fd38a0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 24 Sep 2014 11:22:55 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Propellor/Property/SiteSpecific/JoeySites.hs') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 863a86cf..0b066bb4 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -452,7 +452,7 @@ kiteMailServer = propertyList "kitenet.net mail server" ] `onChange` Postfix.reloaded `describe` "postfix mydomain file configured" - , "/etc/postfix/obscure_client_relay.pcre" `File.containsLines` + , "/etc/postfix/obscure_client_relay.pcre" `File.hasContent` -- Remove received lines for mails relayed from trusted -- clients. These can be a privacy vilation, or trigger -- spam filters. -- cgit v1.3-2-g0d8e From c96ba00822af4147c5dc7c36a8f764ea17c7da1c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 24 Sep 2014 11:27:45 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Propellor/Property/SiteSpecific/JoeySites.hs') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 0b066bb4..a8cfe52c 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -460,7 +460,7 @@ kiteMailServer = propertyList "kitenet.net mail server" -- Remove local Received line for postfix running on a -- trusted client that relays through. These can trigger -- spam filters. - -- , "/^Received: by ([^.]+)\\.kitenet\\.net.*from userid.*/ IGNORE" + , "/^Received: by ([^.]+)\\.kitenet\\.net \\(Postfix, from userid.*/ IGNORE" ] `onChange` Postfix.reloaded `describe` "postfix obscure_client_relay file configured" -- cgit v1.3-2-g0d8e From 960dd0d1f8dc59c6e2ca4c6bccdec4b8d3c161ef Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 24 Sep 2014 11:29:08 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Propellor/Property/SiteSpecific/JoeySites.hs') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index a8cfe52c..24ff6f76 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -460,7 +460,7 @@ kiteMailServer = propertyList "kitenet.net mail server" -- Remove local Received line for postfix running on a -- trusted client that relays through. These can trigger -- spam filters. - , "/^Received: by ([^.]+)\\.kitenet\\.net \\(Postfix, from userid.*/ IGNORE" + -- , "/^Received: by ([^.]+)\\.kitenet\\.net \\(Postfix, from userid.*/ IGNORE" ] `onChange` Postfix.reloaded `describe` "postfix obscure_client_relay file configured" -- cgit v1.3-2-g0d8e From e5dd1f64142188b062a42f49fce0f9955daad18b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 24 Sep 2014 14:03:23 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Propellor/Property/SiteSpecific/JoeySites.hs') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 24ff6f76..15dbd5e6 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -457,10 +457,10 @@ kiteMailServer = propertyList "kitenet.net mail server" -- clients. These can be a privacy vilation, or trigger -- spam filters. [ "/^Received: from ([^.]+)\\.kitenet\\.net.*using TLS.*by kitenet\\.net \\(([^)]+)\\) with (E?SMTPS?A?) id ([A-F[:digit:]]+)(.*)/ IGNORE" - -- Remove local Received line for postfix running on a + -- Munge local Received line for postfix running on a -- trusted client that relays through. These can trigger -- spam filters. - -- , "/^Received: by ([^.]+)\\.kitenet\\.net \\(Postfix, from userid.*/ IGNORE" + , "/^Received: by ([^.]+)\\.kitenet\\.net.*/ REPLACE Received: by kitenet.net" ] `onChange` Postfix.reloaded `describe` "postfix obscure_client_relay file configured" -- cgit v1.3-2-g0d8e From 21117d5e2108fac5bca31e40049eee9368faee63 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 6 Oct 2014 19:44:19 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/Propellor/Property/SiteSpecific/JoeySites.hs') diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 15dbd5e6..fe961ac5 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -70,7 +70,10 @@ oldUseNetServer hosts = propertyList ("olduse.net server") datadir = "/var/spool/oldusenet" oldUseNetShellBox :: Property -oldUseNetShellBox = oldUseNetInstalled "oldusenet" +oldUseNetShellBox = propertyList "olduse.net shellbox" + [ oldUseNetInstalled "oldusenet" + , Service.running "oldusenet" + ] oldUseNetInstalled :: Apt.Package -> Property oldUseNetInstalled pkg = check (not <$> Apt.isInstalled pkg) $ -- cgit v1.3-2-g0d8e From 6a674c79d7d9f58c683695114bca2bdffe671bf7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 8 Oct 2014 13:14:21 -0400 Subject: fix some accidental uses of spaces, rather than tabs, for indentation --- src/Propellor/CmdLine.hs | 8 ++++---- src/Propellor/PrivData.hs | 2 +- src/Propellor/Property.hs | 2 +- src/Propellor/Property/Cmd.hs | 2 +- src/Propellor/Property/Dns.hs | 4 ++-- src/Propellor/Property/Docker.hs | 4 ++-- src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 +- src/Propellor/Property/Ssh.hs | 2 +- src/Propellor/Property/Sudo.hs | 2 +- src/Propellor/Types.hs | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src/Propellor/Property/SiteSpecific/JoeySites.hs') diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs index e1684c38..415b8576 100644 --- a/src/Propellor/CmdLine.hs +++ b/src/Propellor/CmdLine.hs @@ -37,9 +37,9 @@ usage = do processCmdLine :: IO CmdLine processCmdLine = go =<< getArgs where - go ("--help":_) = usage - go ("--spin":h:[]) = return $ Spin h - go ("--boot":h:[]) = return $ Boot h + go ("--help":_) = usage + go ("--spin":h:[]) = return $ Spin h + go ("--boot":h:[]) = return $ Boot h go ("--add-key":k:[]) = return $ AddKey k go ("--set":f:c:[]) = withprivfield f c Set go ("--dump":f:c:[]) = withprivfield f c Dump @@ -48,7 +48,7 @@ processCmdLine = go =<< getArgs go ("--continue":s:[]) = case readish s of Just cmdline -> return $ Continue cmdline Nothing -> errorMessage "--continue serialization failure" - go ("--chain":h:[]) = return $ Chain h + go ("--chain":h:[]) = return $ Chain h go ("--docker":h:[]) = return $ Docker h go (h:[]) | "--" `isPrefixOf` h = usage diff --git a/src/Propellor/PrivData.hs b/src/Propellor/PrivData.hs index f85ded15..f55ab74c 100644 --- a/src/Propellor/PrivData.hs +++ b/src/Propellor/PrivData.hs @@ -114,7 +114,7 @@ listPrivDataFields hosts = do showtable "Data that would be used if set:" $ map mkrow (M.keys $ M.difference wantedmap m) where - header = ["Field", "Context", "Used by"] + header = ["Field", "Context", "Used by"] mkrow k@(field, (Context context)) = [ shellEscape $ show field , shellEscape context diff --git a/src/Propellor/Property.hs b/src/Propellor/Property.hs index 68b6f6a9..ce825192 100644 --- a/src/Propellor/Property.hs +++ b/src/Propellor/Property.hs @@ -31,7 +31,7 @@ propertyList desc ps = Property desc (ensureProperties ps) (combineInfos ps) combineProperties :: Desc -> [Property] -> Property combineProperties desc ps = Property desc (go ps NoChange) (combineInfos ps) where - go [] rs = return rs + go [] rs = return rs go (l:ls) rs = do r <- ensureProperty l case r of diff --git a/src/Propellor/Property/Cmd.hs b/src/Propellor/Property/Cmd.hs index bcd08246..725f5757 100644 --- a/src/Propellor/Property/Cmd.hs +++ b/src/Propellor/Property/Cmd.hs @@ -33,7 +33,7 @@ cmdProperty' cmd params env = property desc $ liftIO $ do , return FailedChange ) where - desc = unwords $ cmd : params + desc = unwords $ cmd : params -- | A property that can be satisfied by running a series of shell commands. scriptProperty :: [String] -> Property diff --git a/src/Propellor/Property/Dns.hs b/src/Propellor/Property/Dns.hs index ddfcf8e6..fb6d8b56 100644 --- a/src/Propellor/Property/Dns.hs +++ b/src/Propellor/Property/Dns.hs @@ -117,7 +117,7 @@ secondaryFor masters hosts domain = RevertableProperty setup cleanup `requires` servingZones cleanup = namedConfWritten - desc = "dns secondary for " ++ domain + desc = "dns secondary for " ++ domain conf = NamedConf { confDomain = domain , confDnsServerType = Secondary @@ -420,7 +420,7 @@ domainHost base (AbsDomain d) addNamedConf :: NamedConf -> Info addNamedConf conf = mempty { _namedconf = NamedConfMap (M.singleton domain conf) } where - domain = confDomain conf + domain = confDomain conf getNamedConf :: Propellor (M.Map Domain NamedConf) getNamedConf = asks $ fromNamedConfMap . _namedconf . hostInfo diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs index 003b7f5b..f441197e 100644 --- a/src/Propellor/Property/Docker.hs +++ b/src/Propellor/Property/Docker.hs @@ -103,7 +103,7 @@ docked hosts cn = RevertableProperty where go desc a = property (desc ++ " " ++ cn) $ do hn <- asks hostName - let cid = ContainerId hn cn + let cid = ContainerId hn cn ensureProperties [findContainer mhost cid cn $ a cid] mhost = findHost hosts (cn2hn cn) @@ -153,7 +153,7 @@ mkContainer cid@(ContainerId hn _cn) h = Container <*> pure (map (\a -> a hn) (_dockerRunParams info)) where info = _dockerinfo $ hostInfo h' - h' = h + h' = h -- expose propellor directory inside the container & volume (localdir++":"++localdir) -- name the container in a predictable way so we diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index fe961ac5..77af65fa 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -379,7 +379,7 @@ obnamRepos :: [String] -> Property obnamRepos rs = propertyList ("obnam repos for " ++ unwords rs) (mkbase : map mkrepo rs) where - mkbase = mkdir "/home/joey/lib/backup" + mkbase = mkdir "/home/joey/lib/backup" `requires` mkdir "/home/joey/lib" mkrepo r = mkdir ("/home/joey/lib/backup/" ++ r ++ ".obnam") mkdir d = File.dirExists d diff --git a/src/Propellor/Property/Ssh.hs b/src/Propellor/Property/Ssh.hs index 3ce67783..4ecdf23e 100644 --- a/src/Propellor/Property/Ssh.hs +++ b/src/Propellor/Property/Ssh.hs @@ -94,7 +94,7 @@ hostKey keytype context = combineProperties desc ] `onChange` restarted where - desc = "known ssh host key (" ++ fromKeyType keytype ++ ")" + desc = "known ssh host key (" ++ fromKeyType keytype ++ ")" installkey p a = withPrivData p context $ \getkey -> property desc $ getkey a install writer ext key = do diff --git a/src/Propellor/Property/Sudo.hs b/src/Propellor/Property/Sudo.hs index 68b56608..3651891d 100644 --- a/src/Propellor/Property/Sudo.hs +++ b/src/Propellor/Property/Sudo.hs @@ -27,6 +27,6 @@ enabledFor user = property desc go `requires` Apt.installed ["sudo"] | not (sudobaseline `isPrefixOf` l) = True | "NOPASSWD" `isInfixOf` l = locked | otherwise = True - modify locked ls + modify locked ls | sudoline locked `elem` ls = ls | otherwise = ls ++ [sudoline locked] diff --git a/src/Propellor/Types.hs b/src/Propellor/Types.hs index 037cd962..0cb02793 100644 --- a/src/Propellor/Types.hs +++ b/src/Propellor/Types.hs @@ -146,4 +146,4 @@ data CmdLine | Continue CmdLine | Chain HostName | Docker HostName - deriving (Read, Show, Eq) + deriving (Read, Show, Eq) -- cgit v1.3-2-g0d8e