summaryrefslogtreecommitdiff
path: root/config-joey.hs
diff options
context:
space:
mode:
authorJoey Hess2014-04-13 20:22:35 -0400
committerJoey Hess2014-04-13 20:22:35 -0400
commitfb1d65125b543b38151974e12a3ad3b672cc9aa6 (patch)
treea91e7a48f9f13f0e42acbe2dfefaeb61ab8664d1 /config-joey.hs
parent774f6600ebf6fc2650206200f74d39f65751a9ff (diff)
propellor spin
Diffstat (limited to 'config-joey.hs')
-rw-r--r--config-joey.hs6
1 files changed, 6 insertions, 0 deletions
diff --git a/config-joey.hs b/config-joey.hs
index ca1c2205..08093043 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -17,6 +17,7 @@ import qualified Propellor.Property.Dns as Dns
import qualified Propellor.Property.OpenId as OpenId
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.Service as Service
import qualified Propellor.Property.SiteSpecific.GitHome as GitHome
import qualified Propellor.Property.SiteSpecific.GitAnnexBuilder as GitAnnexBuilder
@@ -74,7 +75,12 @@ hosts =
& Apt.unattendedUpgrades
& Apt.serviceInstalledRunning "ntp"
& Dns.zones myDnsSecondary
+
& Apt.serviceInstalledRunning "apache2"
+ & File.hasPrivContent "/etc/ssl/certs/web.pem"
+ & File.hasPrivContent "/etc/ssl/private/web.pem"
+ & File.hasPrivContent "/etc/ssl/certs/startssl.pem"
+ & Apache.modEnabled "ssl"
& File.ownerGroup "/srv/web" "joey" "joey"
& cname "git.kitenet.net"