From: Julien Moutinho <julm+burette@autogeree.net>
Date: Mon, 25 Mar 2013 14:10:08 +0000 (+0100)
Subject: Correction : vm_hosted : lhc-remorque : permissions.
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;ds=sidebyside;h=8eaa235cf3ba97f3d3f6bde5b4348ae4b3eabf21;p=lhc%2Fateliers.git

Correction : vm_hosted : lhc-remorque : permissions.
---

diff --git a/etc/nginx/site.d/lhc-remorque/configure.sh b/etc/nginx/site.d/lhc-remorque/configure.sh
index 59645ad..8e07c61 100644
--- a/etc/nginx/site.d/lhc-remorque/configure.sh
+++ b/etc/nginx/site.d/lhc-remorque/configure.sh
@@ -43,34 +43,29 @@ sudo install -m 3771 -o git -g git /dev/stdin \
 	exec /home/git/hooks/remorque/post-update.ikiwiki
 	EOF
 
-if test -d /home/lhc/var/ikiwiki/remorque/.git
+if sudo test -d /home/lhc/var/ikiwiki/remorque/.git
  then sudo -u wiki-"$site" \
 	sh -c 'cd /home/lhc/var/ikiwiki/remorque && git pull -v'
  else
-	(
-	eval cd ~wiki-"$site"
-	set +f
 	sudo -u wiki-"$site" \
 		git clone \
 		 git@localhost:remorqueatelier \
 		 /home/lhc/var/ikiwiki/remorque/git
+	set +f
 	sudo mv -i \
 	 /home/lhc/var/ikiwiki/remorque/git/.git* \
 	 /home/lhc/var/ikiwiki/remorque/git/* \
 	 /home/lhc/var/ikiwiki/remorque/
-	)
 	sudo rmdir /home/lhc/var/ikiwiki/remorque/git
  fi
 
 sudo install -m 400 -o wiki-"$site" -g wiki-"$site" \
    "$tool"/etc/nginx/site.d/"$site"/ikiwiki.setup \
  /home/lhc/var/ikiwiki/remorque/etc/ikiwiki.setup
-eval cd ~wiki-"$site"
 sudo adduser wiki-"$site" www-"$site"
-
 sudo install -d -m 2770 -o wiki-"$site" -g fcgi-"$site" \
  /home/www/pub/"$site"/cgi
-
+cd /
 sudo -u wiki-"$site" ikiwiki \
  --verbose \
  --setup /home/lhc/var/ikiwiki/remorque/etc/ikiwiki.setup \