X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=etc%2Fnginx%2Fsite.d%2Fcyclo-wiki%2Flocal.sh;h=c539e47b5801e128a57d84d2b676177eb22f9ac6;hb=bb846e6b9e15f962af9d73b2dd67dcae8aa95afa;hp=47d02941dab076ad282b3d52be802c1161d61142;hpb=f20eac77687a8cb82a28c35ac8cfdd57bb9b972e;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 47d0294..c539e47 100644
--- a/etc/nginx/site.d/cyclo-wiki/local.sh
+++ b/etc/nginx/site.d/cyclo-wiki/local.sh
@@ -7,15 +7,18 @@ sudo install -m 664 -o www -g www \
  /etc/nginx/x509.d/"$site"/crt.pem
 
 "$tool"/local/apt-get-install ikiwiki \
- libsearch-xapian-perl
+ xapian-omega \
+ libsearch-xapian-perl \
+ libdigest-sha-perl \
+ libhtml-scrubber-perl
 
-"$tool"/local/adduser fcgi-"$site" \
- --disabled-login \
- --disabled-password \
- --group \
- --home /home/www/data/"$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 \
@@ -23,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
@@ -47,21 +50,24 @@ sudo install -m 771 -o git -g git /dev/stdin \
 	EOF
 
 if sudo test -d /home/cyclo/var/ikiwiki/"$site"/src/.git
- then sudo -u wiki-"$site" sh -$-c \
-		'cd /home/cyclo/var/ikiwiki/'"'$site'"'/src &&
+ then sudo -u wiki-"$site" sh -$-c ' \
+		cd /home/cyclo/var/ikiwiki/'"'$site'"'/src &&
 		git pull -v &&
 		git submodule update --recursive --init'
  else
-	sudo -u wiki-"$site" git clone \
-	 git@localhost:cyclowiki \
-	 /home/cyclo/var/ikiwiki/"$site"/src
-	sudo -u wiki-"$site" sh -$-c \
-	 'cd /home/cyclo/var/ikiwiki/'"'$site'"'/src &&
-	 git submodule update --recursive --init'
+	sudo -u wiki-"$site" sh -$-c ' \
+		umask 007 &&
+		git clone \
+		 git@localhost:cyclowiki \
+		 /home/cyclo/var/ikiwiki/'"'$site'"'/src &&
+		cd /home/cyclo/var/ikiwiki/'"'$site'"'/src &&
+		git config core.sharedRepository group &&
+		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 \
@@ -69,12 +75,14 @@ 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 \
+ /home/cyclo/var/ikiwiki/"$site"/src/.ikiwiki/xapian/default
+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";