Trying new set of ownerships (2)

diff --git a/manifests/init.pp b/manifests/init.pp
index 7c51f8d6017946c076ef2e0feb626527970acf61..3be6bdbdfffb19548e62761b2888dfdde2d05261 100644 (file)
--- 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 5386729706a22bf936fcd6a9dc98b3a2bff36c53..aac3de787663a6f8d31e1e2a0acb4e9cf6f65d30 100644 (file)
--- 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