summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2014-07-18 02:08:13 -0400
committerJoey Hess2014-07-18 02:08:13 -0400
commit6957f28945bc4360882c8337f91d471de8fbadee (patch)
treea1082238e19abb21210d7e0cad38a47c0fddae97 /src
parent2812719e5466d2676db3fd5c4ac36c45bb873e89 (diff)
propellor spin
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/Property/Postfix.hs3
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs8
2 files changed, 7 insertions, 4 deletions
diff --git a/src/Propellor/Property/Postfix.hs b/src/Propellor/Property/Postfix.hs
index 1711a7dd..fbe39299 100644
--- a/src/Propellor/Property/Postfix.hs
+++ b/src/Propellor/Property/Postfix.hs
@@ -15,6 +15,9 @@ installed = Apt.serviceInstalledRunning "postfix"
restarted :: Property
restarted = Service.restarted "postfix"
+reloaded :: Property
+reloaded = Service.reloaded "postfix"
+
-- | Configures postfix as a satellite system, which
-- relats all mail through a relay host, which defaults to smtp.domain.
--
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 0838af47..a6be2411 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -435,11 +435,11 @@ kiteMailServer = propertyList "kitenet.net mail server"
, "/ikiwiki\\.info/\tOK"
, "/joeyh\\.name/\tOK"
]
- `onChange` Postfix.restarted
+ `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"
- `onChange` Postfix.restarted
+ `onChange` Postfix.reloaded
`describe` "postfix obscure_client_relay file configured"
, Postfix.mappedFile "/etc/postfix/virtual"
(flip File.containsLines
@@ -447,7 +447,7 @@ kiteMailServer = propertyList "kitenet.net mail server"
, "@joeyh.name\tjoey"
]
) `describe` "postfix virtual file configured"
- `onChange` Postfix.restarted
+ `onChange` Postfix.reloaded
, Postfix.mappedFile "/etc/postfix/relay_clientcerts" $
flip File.hasPrivContentExposed ctx
, Postfix.mainCf `File.containsLines`
@@ -492,7 +492,7 @@ kiteMailServer = propertyList "kitenet.net mail server"
, "smtp_tls_session_cache_database = sdbm:/etc/postfix/smtp_scache"
]
`onChange` Postfix.dedupMainCf
- `onChange` Postfix.restarted
+ `onChange` Postfix.reloaded
`describe` "postfix configured"
, Apt.serviceInstalledRunning "dovecot-imapd"