X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=etc%2Fnginx%2Fsite.d%2Fcyclo-vie%2Fremote.sh;h=87d6cb545572c3ba5e71a6872ecc5c4636fc8b0d;hb=72a6089daa89de50eed53d1e7ce8d8ce02514946;hp=bd26117b3d2d68ce9d0641e2c6f4a2e3aed822d4;hpb=f20eac77687a8cb82a28c35ac8cfdd57bb9b972e;p=lhc%2Fateliers.git

diff --git a/etc/nginx/site.d/cyclo-vie/remote.sh b/etc/nginx/site.d/cyclo-vie/remote.sh
index bd26117..87d6cb5 100644
--- 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
  '