X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=etc%2Fsv%2Fnginx%2Flocal.sh;h=9f4249ef9f46d32c63b7e37187208427dd6a2ba5;hb=8e1e589274d5bb104d193d031cc22e0b4f9bef2d;hp=56addd06d865c2fd2f685ecdba608036e90b4595;hpb=83b3ca83e8d9f263b25052cc1be78af145623857;p=lhc%2Fateliers.git

diff --git a/etc/sv/nginx/local.sh b/etc/sv/nginx/local.sh
index 56addd0..9f4249e 100644
--- a/etc/sv/nginx/local.sh
+++ b/etc/sv/nginx/local.sh
@@ -1,5 +1,5 @@
 "$tool"/local/runit-sv-configure php5-fpm '*'
-"$tool"/local/runit-sv-restart   php5-fpm
+"$tool"/local/runit-sv-start     php5-fpm
 "$tool"/local/apt-get-install nginx spawn-fcgi fcgiwrap
 "$tool"/local/insserv-remove  nginx
 "$tool"/local/insserv-remove fcgiwrap
@@ -37,7 +37,7 @@ for site in $(find "$tool"/etc/nginx/site.d \
 	 --disabled-login \
 	 --disabled-password \
 	 --group \
-	 --home /home/www/pub/"$site" \
+	 --home /home/www/data/"$site" \
 	 --shell /bin/false \
 	 --system
 	"$tool"/local/adduser log-www-"$site" \
@@ -53,9 +53,9 @@ for site in $(find "$tool"/etc/nginx/site.d \
 	 /etc/nginx/site.d/"$site"
 	sudo install -d -m 770 -o www -g www \
 	 /etc/nginx/x509.d/"$site"
-	sudo test -L /home/www/pub/"$site" ||
+	sudo test -L /home/www/data/"$site" ||
 	sudo install -d -m 2770 -o www-"$site" -g www-"$site" \
-	 /home/www/pub/"$site"
+	 /home/www/data/"$site"
 	sudo adduser www-data www-"$site"
 	sudo adduser www-data log-www-"$site"
 	sudo install -m 660 -o www -g www \
@@ -78,9 +78,12 @@ for site in $(find "$tool"/etc/nginx/site.d \
 	sudo install -m 660 -o www -g www /dev/stdin \
 	 /etc/nginx/site.d/"$site"/server.conf <<-EOF
 		server {
+			include /etc/nginx/conf.d/letsencrypt.conf;
 			access_log /home/www/log/$site/nginx/access.log main;
 			error_log  /home/www/log/$site/nginx/error.log warn;
-			root       /home/www/pub/$site;
+			$(if ! grep -q '^root\>' "$tool"/etc/nginx/site.d/"$site"/site.conf
+				then printf 'root %s;' /home/www/data/"$site"
+				fi)
 			include    /etc/nginx/site.d/$site/local.conf;
 			include    /etc/nginx/site.d/$site/site.conf;
 		 }