summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-04-14 14:04:18 -0400
committerJoey Hess2014-04-14 14:04:18 -0400
commit2097be5ff4a01a6acc9063ce9b62928a5f892b73 (patch)
tree59b3ae25c99f1a947f5846d413d6cbc6c78e871b
parentf116d6be5f29c53bb0941fb45a8180c547d777cf (diff)
propellor spin
-rw-r--r--Propellor/Property/SiteSpecific/JoeySites.hs2
-rw-r--r--config-joey.hs1
2 files changed, 2 insertions, 1 deletions
diff --git a/Propellor/Property/SiteSpecific/JoeySites.hs b/Propellor/Property/SiteSpecific/JoeySites.hs
index 2a6dffe4..4f760640 100644
--- a/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -127,6 +127,8 @@ annexWebSite hosts origin hn uuid remotes = propertyList (hn ++" website using g
, " <Directory /srv/web/"++hn++">"
, " Options Indexes FollowSymLinks ExecCGI"
, " AllowOverride None"
+ , " AddHandler cgi-script .cgi"
+ , " DirectoryIndex index.cgi"
, " Order allow,deny"
, " allow from all"
, " </Directory>"
diff --git a/config-joey.hs b/config-joey.hs
index 166e84e4..e5ccac3b 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -18,7 +18,6 @@ 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
import qualified Propellor.Property.SiteSpecific.JoeySites as JoeySites