X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=etc%2Fnginx%2Fsite.d%2Fcyclo-wiki%2Flocal.sh;h=d7edf2dee07d13127814a899922b884c6aca3b42;hb=29b16fdc242f25e720991f1b4ec5da493e08b8e3;hp=2f2f92394305d4962c8c5a20614b8520174f9246;hpb=2f6c2a51cf62e506ded2aa1cc758ba67f0aee7fd;p=lhc%2Fateliers.git

diff --git a/etc/nginx/site.d/cyclo-wiki/local.sh b/etc/nginx/site.d/cyclo-wiki/local.sh
index 2f2f923..d7edf2d 100644
--- a/etc/nginx/site.d/cyclo-wiki/local.sh
+++ b/etc/nginx/site.d/cyclo-wiki/local.sh
@@ -33,7 +33,7 @@ sudo install -d -m 2770 -o wiki-"$site" -g wiki-"$site" \
  /home/cyclo/var/ikiwiki/"$site"
 sudo install -d -m 3771 -o git -g git \
  /home/git/hooks/cyclo
-sudo install -d -m 750 -o wiki-"$site" -g git \
+sudo install -d -m 2770 -o git -g www-"$site" \
  /home/git/hooks/cyclo/"$site"
 sudo install -m 771 -o git -g git /dev/stdin \
  /home/git/data/cyclowiki.git/hooks/post-update <<-EOF
@@ -46,6 +46,7 @@ sudo install -m 771 -o git -g git /dev/stdin \
 	# "E: Failed to change to directory '...': Permission denied"
 	cd /
 	
+	umask 002
 	exec /home/git/hooks/cyclo/$site/post-update.ikiwiki
 	EOF
 
@@ -56,12 +57,12 @@ if sudo test -d /home/cyclo/var/ikiwiki/"$site"/src/.git
 		git submodule update --recursive --init'
  else
 	sudo -u wiki-"$site" sh -$-c ' \
-		umask 007 &&
+		umask 002 &&
 		git clone \
 		 git@localhost:cyclowiki \
 		 /home/cyclo/var/ikiwiki/'"'$site'"'/src &&
 		cd /home/cyclo/var/ikiwiki/'"'$site'"'/src &&
-		git config core.sharedRepository group &&
+		git config core.sharedRepository 0664 &&
 		git submodule update --recursive --init
 	 '
  fi
@@ -75,13 +76,10 @@ sudo -u wiki-"$site" ikiwiki \
  --setup /home/cyclo/var/ikiwiki/"$site"/src/ikiwiki.setup \
  --refresh \
  --wrappers
-sudo chown wiki-"$site":www-"$site" \
- /home/git/hooks/cyclo/"$site"/post-update.ikiwiki
-sudo chmod 6755 \
- /home/git/hooks/cyclo/"$site"/post-update.ikiwiki
 sudo chmod g+w \
  /home/cyclo/var/ikiwiki/"$site"/src/.ikiwiki \
- /home/cyclo/var/ikiwiki/"$site"/src/.ikiwiki/xapian/default
+ /home/cyclo/var/ikiwiki/"$site"/src/.ikiwiki/xapian/wiki # TODO: chmod all database
+
 sudo install -m 664 -o wiki-"$site" -g wiki-"$site" /dev/stdin \
  /home/cyclo/var/ikiwiki/"$site"/src/.ikiwiki/xapian/omega.conf <<-EOF
 	database_dir .