diff options
| author | Joey Hess <joey@kitenet.net> | 2014-07-17 21:47:15 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-17 21:47:15 -0400 |
| commit | cb7009e994af067f077c845035adb8f6ee9a9d0a (patch) | |
| tree | f4489868b834709ee0bd376910613fc49d67e48b /src | |
| parent | 74ee9d24ea70d618a175c6dcd34bff32aa7d5a7a (diff) | |
propellor spin
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/JoeySites.hs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index eaed66b1..f9bbb50b 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -410,14 +410,17 @@ kiteMailServer = propertyList "kitenet.net mail server" , "/joeyh\\.name/\tOK" ] `onChange` Service.restarted "postfix" + `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" `onChange` Service.restarted "postfix" - , Postfix.mappedFile "/etc/postfix/virtual" $ - flip File.containsLines + `describe` "postfix obscure_client_relay file configured" + , Postfix.mappedFile "/etc/postfix/virtual" + (flip File.containsLines [ "# *@joeyh.name to joey" , "@joeyh.name\tjoey" ] + ) `describe` "postfix virtual file configured" , Postfix.mappedFile "/etc/postfix/relay_clientcerts" $ flip File.hasPrivContentExposed ctx , "/etc/postfix/main.cf" `File.containsLines` @@ -462,6 +465,7 @@ kiteMailServer = propertyList "kitenet.net mail server" , "smtp_tls_session_cache_database = sdbm:/etc/postfix/smtp_scache" ] `onChange` Service.restarted "postfix" + `describe` "postfix configured" , Apt.serviceInstalledRunning "dovecot-imapd" , Apt.serviceInstalledRunning "dovecot-pop3d" , Apt.serviceInstalledRunning "cron" |