X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=etc%2Fnginx%2Fsite.d%2Flhc-remorque%2Fconfigure.sh;h=1bf5045b93a4d617935dc947145114849375e3f3;hp=8e07c618b1ce477c88a1342ac2598032251e23c3;hb=eefc410c23df14d9e47bfc1eedcfb500d557c5a8;hpb=8eaa235cf3ba97f3d3f6bde5b4348ae4b3eabf21

diff --git a/etc/nginx/site.d/lhc-remorque/configure.sh b/etc/nginx/site.d/lhc-remorque/configure.sh
index 8e07c61..1bf5045 100644
--- a/etc/nginx/site.d/lhc-remorque/configure.sh
+++ b/etc/nginx/site.d/lhc-remorque/configure.sh
@@ -1,4 +1,4 @@
-local hint="run vm_remote nginx_configure before"
+local hint="run before: ./vm_remote runit_configure nginx -- $site"
 assert "sudo getent passwd wiki-\"$site\" >/dev/null" hint
 assert "sudo test -f ~wiki-$site/etc/ssh/id_rsa" hint
 
@@ -28,9 +28,10 @@ sudo install -d -m 2770 -o wiki-"$site" -g wiki-"$site" \
 sudo install -d -m 2770 -o wiki-"$site" -g wiki-"$site" \
  /home/lhc/var/ikiwiki/remorque
 sudo install -d -m 2750 -o wiki-"$site" -g git \
- /home/git/hooks/remorque
-sudo install -m 3771 -o git -g git /dev/stdin \
- /home/git/pub/remorqueatelier.git/hooks/post-update <<-EOF
+ /home/git/hooks/lhc \
+ /home/git/hooks/lhc/remorque
+sudo install -m 771 -o git -g git /dev/stdin \
+ /home/git/pub/lhc/remorque.git/hooks/post-update <<-EOF
 	#!/bin/sh -efux
 	
 	# The cd below is why we must use this script.
@@ -40,7 +41,7 @@ sudo install -m 3771 -o git -g git /dev/stdin \
 	# "E: Failed to change to directory '...': Permission denied"
 	cd /
 	
-	exec /home/git/hooks/remorque/post-update.ikiwiki
+	exec /home/git/hooks/lhc/remorque/post-update.ikiwiki
 	EOF
 
 if sudo test -d /home/lhc/var/ikiwiki/remorque/.git
@@ -49,7 +50,7 @@ if sudo test -d /home/lhc/var/ikiwiki/remorque/.git
  else
 	sudo -u wiki-"$site" \
 		git clone \
-		 git@localhost:remorqueatelier \
+		 git@localhost:lhc/remorque \
 		 /home/lhc/var/ikiwiki/remorque/git
 	set +f
 	sudo mv -i \