From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 25 Jan 2010 20:55:49 +0000 (-0200)
Subject: Trying new set of ownerships (2)
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=c61a929c1e7107af9e5dc4de72bb02aed4f10d09;p=puppet-ikiwiki.git

Trying new set of ownerships (2)
---

diff --git a/manifests/init.pp b/manifests/init.pp
index 7c51f8d..3be6bdb 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -41,7 +41,7 @@ class ikiwiki {
     case $ensure {
       'present': {
         exec { "ikiwiki --setup /etc/ikiwiki/$name.setup":
-          user        => gitosis,
+          user        => root,
           refreshonly => true,
         }
     
diff --git a/templates/deploy.sh.erb b/templates/deploy.sh.erb
index 5386729..aac3de7 100644
--- a/templates/deploy.sh.erb
+++ b/templates/deploy.sh.erb
@@ -5,8 +5,9 @@ INSTANCE="$2"
 BASE="<%= apache_sites_folder %>"
 SITE=$BASE/$NAME
 CONF="/etc/ikiwiki"
-OWNER="gitosis"
+WEB_OWNER="www-data"
 WEB_GROUP="www-data"
+REPO_OWNER="www-data"
 REPO_GROUP="gitosis"
 REPO="/var/git/repositories/$NAME.git"
 
@@ -39,5 +40,5 @@ touch $REPO/git-daemon-export-ok
 ikiwiki --setup /etc/ikiwiki/$NAME.setup
 
 # Set permissions
-chown -R $OWNER.$WEB_GROUP $SITE/"$INSTANCE"_src $SITE/$INSTANCE
-chown -R $OWNER.$REPO_GROUP $REPO
+chown -R $WEB_OWNER.$WEB_GROUP $SITE/"$INSTANCE"_src $SITE/$INSTANCE
+chown -R $REPO_OWNER.$REPO_GROUP $REPO