summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorJoey Hess2014-05-31 14:28:12 -0400
committerJoey Hess2014-05-31 14:28:12 -0400
commitc7b74717783a997ea646bde8cc8bbcca22d94e52 (patch)
tree186e3d87a81b302bf17b4f9b6195c34f4d68d57c /src/Propellor
parent7ba8556a97578d0402e7580f41eb3557a04e1713 (diff)
propellor spin
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index fd536ad4..f6e1e37f 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -321,21 +321,12 @@ ircBouncer = propertyList "IRC bouncer"
kiteShellBox :: Property
kiteShellBox = propertyList "kitenet.net shellinabox"
[ Apt.installed ["shellinabox"]
-
- -- Set up certs directory, allowing shellinabox write access.
- -- It will create its own self-signed cert.
- , File.dirExists certdir
- , File.ownerGroup certdir "shellinabox" "shellinabox"
- , File.mode certdir (combineModes [ownerWriteMode, ownerReadMode, ownerExecuteMode])
-
, File.hasContent "/etc/default/shellinabox"
[ "# Deployed by propellor"
, "SHELLINABOX_DAEMON_START=1"
, "SHELLINABOX_PORT=443"
- , "SHELLINABOX_ARGS=\"--no-beep --service=/:SSH:kitenet.net --cert=" ++ certdir ++ "\""
+ , "SHELLINABOX_ARGS=\"--no-beep --service=/:SSH:kitenet.net\""
]
`onChange` Service.restarted "shellinabox"
, Service.running "shellinabox"
]
- where
- certdir = "/etc/shellinabox/certs"