summaryrefslogtreecommitdiff
path: root/config-joey.hs
diff options
context:
space:
mode:
authorJoey Hess2014-05-01 10:49:52 -0300
committerJoey Hess2014-05-01 10:49:52 -0300
commit6088df9105a10ef446cc236982c2e30857182a84 (patch)
treea407345854637915fca54e61a68819731b375e05 /config-joey.hs
parentf058e47574603fffffc3f60305bc874b78f7770f (diff)
parent2bc9a2a7379f80595f5b8f3dc5475f64d5537cfc (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'config-joey.hs')
-rw-r--r--config-joey.hs7
1 files changed, 7 insertions, 0 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 254e810a..a35f77bd 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -1,4 +1,5 @@
-- This is the live config file used by propellor's author.
+module Main where
import Propellor
import Propellor.CmdLine
@@ -19,6 +20,7 @@ import qualified Propellor.Property.Docker as Docker
import qualified Propellor.Property.Git as Git
import qualified Propellor.Property.Apache as Apache
import qualified Propellor.Property.Postfix as Postfix
+import qualified Propellor.Property.Service as Service
import qualified Propellor.Property.SiteSpecific.GitHome as GitHome
import qualified Propellor.Property.SiteSpecific.GitAnnexBuilder as GitAnnexBuilder
import qualified Propellor.Property.SiteSpecific.JoeySites as JoeySites
@@ -73,6 +75,11 @@ hosts = -- (o) `
& Docker.garbageCollected `period` Daily
& Apt.installed ["git-annex", "mtr", "screen"]
+
+ -- Nothing is using https on clam, so listen on that port
+ -- for ssh, for traveling on bad networks.
+ & "/etc/ssh/sshd_config" `File.containsLine` "Port 443"
+ `onChange` Service.restarted "ssh"
-- Orca is the main git-annex build box.
, standardSystem "orca.kitenet.net" Unstable "amd64"