aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-04-11 21:01:48 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-04-11 21:01:48 -0300
commit518445525683dc61a099c1b2b9b84a611c44ba4b (patch)
tree6b18c14ae4f3f404aa0d5a7caf567a9a9799a0d7
parent4b4bbc4b49ec0ac6dceb5d276bfb08d1a96ae306 (diff)
downloadpuppet-ikiwiki-518445525683dc61a099c1b2b9b84a611c44ba4b.tar.gz
puppet-ikiwiki-518445525683dc61a099c1b2b9b84a611c44ba4b.tar.bz2
Cleanup and permission fixes
-rw-r--r--templates/refresh.sh.erb16
1 files changed, 6 insertions, 10 deletions
diff --git a/templates/refresh.sh.erb b/templates/refresh.sh.erb
index 6353822..fea8e14 100644
--- a/templates/refresh.sh.erb
+++ b/templates/refresh.sh.erb
@@ -34,13 +34,9 @@ fi
ikiwiki --setup /etc/ikiwiki/$NAME.setup
# Fix permissions
-chown -R $REPO_OWNER. $REPO
-chown -R $OWNER.$GROUP $SITE/"$INSTANCE"_src $SITE/$INSTANCE
-chown $OWNER.$WWW_USER $SITE/$INSTANCE/ikiwiki.cgi
-chmod 6550 $SITE/$INSTANCE/ikiwiki.cgi
-chown $OWNER.$REPO $REPO/hooks/post-update
-chmod 6550 $REPO/hooks/post-update
-
-# Setuid/setgid
-chmod 0755 $REPO/hooks/post-update
-chmod 0550 $SITE/$INSTANCE/ikiwiki.cgi
+chown -R $REPO_OWNER. $REPO
+chown -R $OWNER.$GROUP $SITE/"$INSTANCE"_src $SITE/$INSTANCE
+chown $OWNER.$WWW_USER $SITE/$INSTANCE/ikiwiki.cgi
+chmod 6550 $SITE/$INSTANCE/ikiwiki.cgi
+chown $OWNER.$REPO_OWNER $REPO/hooks/post-update
+chmod 6550 $REPO/hooks/post-update