cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propellor spin

This commit is contained in:
Joey Hess 2014-07-17 21:47:15 -04:00
parent 74ee9d24ea
commit cb7009e994
Failed to extract signature
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Propellor/Property/SiteSpecific/JoeySites.hs
View File

@ -410,14 +410,17 @@ kiteMailServer = propertyList "kitenet.net mail server"
, "/joeyh\\.name/\tOK" , "/joeyh\\.name/\tOK"
] ]
`onChange` Service.restarted "postfix" `onChange` Service.restarted "postfix"
`describe` "postfix mydomain file configured"
, "/etc/postfix/obscure_client_relay.pcre" `File.containsLine` , "/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" "/^Received: from ([^.]+)\\.kitenet\\.net.*using TLS.*by kitenet\\.net \\(([^)]+)\\) with (E?SMTPS?A?) id ([A-F[:digit:]]+)(.*)/ IGNORE"
`onChange` Service.restarted "postfix" `onChange` Service.restarted "postfix"
, Postfix.mappedFile "/etc/postfix/virtual" $ `describe` "postfix obscure_client_relay file configured"
flip File.containsLines , Postfix.mappedFile "/etc/postfix/virtual"
(flip File.containsLines
[ "# *@joeyh.name to joey" [ "# *@joeyh.name to joey"
, "@joeyh.name\tjoey" , "@joeyh.name\tjoey"
] ]
) `describe` "postfix virtual file configured"
, Postfix.mappedFile "/etc/postfix/relay_clientcerts" $ , Postfix.mappedFile "/etc/postfix/relay_clientcerts" $
flip File.hasPrivContentExposed ctx flip File.hasPrivContentExposed ctx
, "/etc/postfix/main.cf" `File.containsLines` , "/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" , "smtp_tls_session_cache_database = sdbm:/etc/postfix/smtp_scache"
] ]
`onChange` Service.restarted "postfix" `onChange` Service.restarted "postfix"
`describe` "postfix configured"
, Apt.serviceInstalledRunning "dovecot-imapd" , Apt.serviceInstalledRunning "dovecot-imapd"
, Apt.serviceInstalledRunning "dovecot-pop3d" , Apt.serviceInstalledRunning "dovecot-pop3d"
, Apt.serviceInstalledRunning "cron" , Apt.serviceInstalledRunning "cron"