X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=etc%2Fnginx%2Fsite.d%2Fcyclo-wiki%2Flocal.sh;h=d7edf2dee07d13127814a899922b884c6aca3b42;hb=29b16fdc242f25e720991f1b4ec5da493e08b8e3;hp=a37237df988202eaf89d61100d8911cf431665a6;hpb=f135690b35e8a5349b210714c0ec04fc3d81e7d8;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 a37237d..d7edf2d 100644
--- a/etc/nginx/site.d/cyclo-wiki/local.sh
+++ b/etc/nginx/site.d/cyclo-wiki/local.sh
@@ -12,13 +12,13 @@ sudo install -m 664 -o www -g www \
  libdigest-sha-perl \
  libhtml-scrubber-perl
 
-"$tool"/local/adduser fcgi-"$site" \
- --disabled-login \
- --disabled-password \
- --group \
- --home /home/cyclo/var/ikiwiki/'"'$site'"' \
- --shell /bin/false \
- --system
+#"$tool"/local/adduser fcgi-"$site" \
+# --disabled-login \
+# --disabled-password \
+# --group \
+# --home /home/cyclo/var/ikiwiki/'"'$site'"' \
+# --shell /bin/false \
+# --system
 "$tool"/local/adduser www-"$site" \
  --disabled-login \
  --disabled-password \
@@ -26,14 +26,14 @@ sudo install -m 664 -o www -g www \
  --home /home/www/data/"$site" \
  --shell /bin/false \
  --system
-sudo adduser fcgi-"$site" www-"$site"
-sudo adduser fcgi-"$site" wiki-"$site"
+#sudo adduser fcgi-"$site" www-"$site"
+#sudo adduser fcgi-"$site" wiki-"$site"
 #sudo adduser www-"$site"-tls www-"$site"
 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,18 +57,18 @@ 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
 
 sudo adduser wiki-"$site" www-"$site"
-sudo install -d -m 2770 -o wiki-"$site" -g fcgi-"$site" \
+sudo install -d -m 2770 -o wiki-"$site" -g wiki-"$site" \
  /home/www/data/"$site"/cgi
 cd /
 sudo -u wiki-"$site" ikiwiki \
@@ -75,13 +76,15 @@ sudo -u wiki-"$site" ikiwiki \
  --setup /home/cyclo/var/ikiwiki/"$site"/src/ikiwiki.setup \
  --refresh \
  --wrappers
-sudo chown fcgi-"$site":wiki-"$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 .
+	template_dir ./templates
+	EOF
 
 sudo cat /etc/gitweb/gitweb.conf - <<-EOF |
 	\$export_ok = "cyclo-wiki-export-ok";