From c7b74717783a997ea646bde8cc8bbcca22d94e52 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 31 May 2014 14:28:12 -0400
Subject: [PATCH] propellor spin

---
 src/Propellor/Property/SiteSpecific/JoeySites.hs | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index fd536ad..f6e1e37 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"