From: Silvio Rhatto Date: Thu, 11 Apr 2013 22:32:55 +0000 (-0300) Subject: Another cleanup X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=cada1b7eceae9cbf6e19817ffb09c955a7fb6fd6;p=puppet-ikiwiki.git Another cleanup --- 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