aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-04-11 19:32:55 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-04-11 19:32:55 -0300
commitcada1b7eceae9cbf6e19817ffb09c955a7fb6fd6 (patch)
treecebb51cc0e5ab29139074f1baacbaab6680fa715
parentda153bfe959b110278bf18ee384a202698674a75 (diff)
downloadpuppet-ikiwiki-cada1b7eceae9cbf6e19817ffb09c955a7fb6fd6.tar.gz
puppet-ikiwiki-cada1b7eceae9cbf6e19817ffb09c955a7fb6fd6.tar.bz2
Another cleanup
-rw-r--r--README2
-rw-r--r--templates/deploy.sh.erb4
2 files changed, 1 insertions, 5 deletions
diff --git a/README b/README
index 1879a06..35e713c 100644
--- a/README
+++ b/README
@@ -15,7 +15,7 @@ The following setup is used:
- Wiki pages are served under it's own user, but the cgi usually runs under www-data.
- The git daemon runs on its own user and group.
-So the recommended suid for the cgi and the post update hook are used normally.
+So the recommended suid for the cgi and the post-update hook are used normally.
For that to work, you, the wiki user and root needs ssh read/write access to the git daemon:
diff --git a/templates/deploy.sh.erb b/templates/deploy.sh.erb
index 80b1b36..bd4031d 100644
--- a/templates/deploy.sh.erb
+++ b/templates/deploy.sh.erb
@@ -39,9 +39,5 @@ git clone $REPO $SITE/"$INSTANCE"_src
# Fix remotes
( cd $SITE/"$INSTANCE"_src && git remote rm origin && git remote add origin $REMOTE )
-# Fix permissions
-chown $REPO_OWNER. $REPO
-chown $WEB_OWNER.$WEB_GROUP $SITE/"$INSTANCE"_src
-
# Cleanup
rm -rf $SITE/"$INSTANCE"_src_tmp