Correction : nginx/site.d/cyclo-{vie,wiki} : perms.

[lhc/ateliers.git] / etc / nginx / site.d / cyclo-vie / local.sh

diff --git a/etc/nginx/site.d/cyclo-vie/local.sh b/etc/nginx/site.d/cyclo-vie/local.sh
index 85e0f2c..d4ed833 100644 (file)
--- a/etc/nginx/site.d/cyclo-vie/local.sh
+++ b/etc/nginx/site.d/cyclo-vie/local.sh
@@ -7,13 +7,16 @@ 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" \
+ --home /home/cyclo/var/ikiwiki/'"'$site'"' \
  --shell /bin/false \
  --system
 "$tool"/local/adduser www-"$site" \
@@ -47,17 +50,20 @@ 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:cyclovie \
-        /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:cyclovie \
+                /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"
@@ -69,12 +75,13 @@ sudo -u wiki-"$site" ikiwiki \
  --setup /home/cyclo/var/ikiwiki/"$site"/src/ikiwiki.setup \
  --refresh \
  --wrappers
-sudo chown wiki-"$site":www-"$site" \
+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 \
+ /home/cyclo/var/ikiwiki/"$site"/src/.ikiwiki/xapian/default
 
 sudo cat /etc/gitweb/gitweb.conf - <<-EOF |
        \$export_ok = "cyclo-vie-export-ok";