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

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

diff --git a/etc/nginx/site.d/cyclo-vie/remote.sh b/etc/nginx/site.d/cyclo-vie/remote.sh
index bd26117..87d6cb5 100644 (file)
--- a/etc/nginx/site.d/cyclo-vie/remote.sh
+++ b/etc/nginx/site.d/cyclo-vie/remote.sh
@@ -1,5 +1,7 @@
 gpg --decrypt "$tool"/var/sec/ssh/wiki-"$site".gpg |
 "$tool"/remote/ssh root@"$local_ipv4" ' \
+       set +x
+       key=$(cat)
        set -e -f -u -x
        sudo install -d -m 1751 -o cyclo -g cyclo \
         /home/cyclo \
@@ -10,7 +12,7 @@ gpg --decrypt "$tool"/var/sec/ssh/wiki-"$site".gpg |
         --disabled-login \
         --disabled-password \
         --group \
-        --home /home/cyclo/var/ikiwiki/'"'$site'"' \
+        --home /home/cyclo/var/ikiwiki/'"'$site'"'/fcgi \
         --shell /bin/false \
         --system
        sudo install -d -m 2770 -o wiki-'"'$site'"' -g wiki-'"'$site'"' \
@@ -18,5 +20,15 @@ gpg --decrypt "$tool"/var/sec/ssh/wiki-"$site".gpg |
        sudo install -d -m 750 -o wiki-'"'$site'"' -g wiki-'"'$site'"' \
         /home/cyclo/var/ikiwiki/'"'$site'"'/etc/ssh
        sudo install    -m 400 -o wiki-'"'$site'"' -g wiki-'"'$site'"' /dev/stdin \
-        /home/cyclo/var/ikiwiki/'"'$site'"'/etc/ssh/id_rsa
+        /home/cyclo/var/ikiwiki/'"'$site'"'/etc/ssh/id_rsa <<-EOF
+               $key
+               EOF
+       sudo install -d -m 2770 -o fcgi-'"'$site'"' -g fcgi-'"'$site'"' \
+        /home/cyclo/var/ikiwiki/'"'$site'"'/fcgi
+       sudo install -d -m 750 -o fcgi-'"'$site'"' -g fcgi-'"'$site'"' \
+        /home/cyclo/var/ikiwiki/'"'$site'"'/fcgi/etc/ssh
+       sudo install    -m 400 -o fcgi-'"'$site'"' -g fcgi-'"'$site'"' /dev/stdin \
+        /home/cyclo/var/ikiwiki/'"'$site'"'/fcgi/etc/ssh/id_rsa <<-EOF
+               $key
+               EOF
  '