From 2f6c2a51cf62e506ded2aa1cc758ba67f0aee7fd Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm+heureux-cyclage@autogeree.net>
Date: Sun, 16 Mar 2014 06:26:23 +0100
Subject: [PATCH] Correction : cyclo-wiki : perms.

---
 etc/nginx/site.d/cyclo-wiki/local.sh | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/etc/nginx/site.d/cyclo-wiki/local.sh b/etc/nginx/site.d/cyclo-wiki/local.sh
index 1e39f7e..2f2f923 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,8 +26,8 @@ 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"
@@ -67,7 +67,7 @@ if sudo test -d /home/cyclo/var/ikiwiki/"$site"/src/.git
  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 \
@@ -82,6 +82,11 @@ sudo chmod 6755 \
 sudo chmod g+w \
  /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";
-- 
2.20.1