/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 \
--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
# "E: Failed to change to directory '...': Permission denied"
cd /
+ umask 002
exec /home/git/hooks/cyclo/$site/post-update.ikiwiki
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 002 &&
+ git clone \
+ git@localhost:cyclowiki \
+ /home/cyclo/var/ikiwiki/'"'$site'"'/src &&
+ cd /home/cyclo/var/ikiwiki/'"'$site'"'/src &&
+ 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 \
--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/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";