summaryrefslogtreecommitdiff
path: root/config-joey.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 /config-joey.hs
parent703c08cd618ec3d0f299b1f715e0ebfb7233ea09 (diff)
parentb82390983dd285e18df43c979d909331f44a01da (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'config-joey.hs')
-rw-r--r--config-joey.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 98cb195a..df6e40dc 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -25,6 +25,7 @@ import qualified Propellor.Property.Gpg as Gpg
import qualified Propellor.Property.Systemd as Systemd
import qualified Propellor.Property.Journald as Journald
import qualified Propellor.Property.Chroot as Chroot
+import qualified Propellor.Property.Fail2Ban as Fail2Ban
import qualified Propellor.Property.Aiccu as Aiccu
import qualified Propellor.Property.OS as OS
import qualified Propellor.Property.HostingProvider.CloudAtCost as CloudAtCost
@@ -221,7 +222,7 @@ kite = standardSystemUnhardened "kite.kitenet.net" Testing "amd64"
& Journald.systemMaxUse "500MiB"
& Ssh.passwordAuthentication True
-- Since ssh password authentication is allowed:
- & Apt.serviceInstalledRunning "fail2ban"
+ & Fail2Ban.installed
& Obnam.backupEncrypted "/" (Cron.Times "33 1 * * *")
[ "--repository=sftp://joey@eubackup.kitenet.net/~/lib/backup/kite.obnam"
, "--client-name=kitenet.net"