aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-09-26 14:33:10 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-09-26 14:33:10 -0300
commit3f055da762cb03117de80a38a9ae4194cd9e9d28 (patch)
treee1e3aaef4cbde19c51483f5b13d9ce9b09f79f81
parenta7a266d725e2a9a4bf478a8bcab6f07280b41907 (diff)
downloadpuppet-ikiwiki-3f055da762cb03117de80a38a9ae4194cd9e9d28.tar.gz
puppet-ikiwiki-3f055da762cb03117de80a38a9ae4194cd9e9d28.tar.bz2
Explicitly chown instance folder
-rw-r--r--templates/deploy.sh.erb1
-rw-r--r--templates/refresh.sh.erb3
2 files changed, 2 insertions, 2 deletions
diff --git a/templates/deploy.sh.erb b/templates/deploy.sh.erb
index 2c7f789..cc31401 100644
--- a/templates/deploy.sh.erb
+++ b/templates/deploy.sh.erb
@@ -39,7 +39,6 @@ ikiwiki-makerepo git $SITE/"$INSTANCE"_src_tmp $REPO
git clone $REPO $SITE/"$INSTANCE"_src
# Fix remotes
-
cd $SITE/"$INSTANCE"_src
git remote rm origin
git remote add origin $REMOTE
diff --git a/templates/refresh.sh.erb b/templates/refresh.sh.erb
index fea8e14..6ef0b7d 100644
--- a/templates/refresh.sh.erb
+++ b/templates/refresh.sh.erb
@@ -35,7 +35,8 @@ ikiwiki --setup /etc/ikiwiki/$NAME.setup
# Fix permissions
chown -R $REPO_OWNER. $REPO
-chown -R $OWNER.$GROUP $SITE/"$INSTANCE"_src $SITE/$INSTANCE
+chown -R $OWNER.$GROUP $SITE/"$INSTANCE"_src
+chown -R $OWNER.$GROUP $SITE/$INSTANCE
chown $OWNER.$WWW_USER $SITE/$INSTANCE/ikiwiki.cgi
chmod 6550 $SITE/$INSTANCE/ikiwiki.cgi
chown $OWNER.$REPO_OWNER $REPO/hooks/post-update