summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/SiteSpecific/JoeySites.hs
diff options
context:
space:
mode:
authorJoey Hess2015-11-30 13:34:18 -0400
committerJoey Hess2015-11-30 13:34:18 -0400
commitd6d63ff095e6584e5a28eb39139f1cd7e83534d3 (patch)
tree5f6f4a94f4f73825d4c08cfc5ff252e6416445d5 /src/Propellor/Property/SiteSpecific/JoeySites.hs
parent703c08cd618ec3d0f299b1f715e0ebfb7233ea09 (diff)
parentb82390983dd285e18df43c979d909331f44a01da (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/SiteSpecific/JoeySites.hs')
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 2e34d75f..ff92bf2d 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -17,6 +17,7 @@ import qualified Propellor.Property.Obnam as Obnam
import qualified Propellor.Property.Apache as Apache
import qualified Propellor.Property.Postfix as Postfix
import qualified Propellor.Property.Systemd as Systemd
+import qualified Propellor.Property.Fail2Ban as Fail2Ban
import Utility.FileMode
import Data.List
@@ -541,6 +542,8 @@ kiteMailServer = propertyList "kitenet.net mail server" $ props
& dkimInstalled
& Postfix.saslAuthdInstalled
+ & Fail2Ban.installed
+ & Fail2Ban.jailEnabled "postfix-sasl"
& "/etc/default/saslauthd" `File.containsLine` "MECHANISMS=sasldb"
& Postfix.saslPasswdSet "kitenet.net" (User "errol")