X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=etc%2Fsv%2Fnginx%2Fconfigure.sh;h=a44c647168ffe34a8945209348520e9725e4dc53;hp=ad988a239676ab34b82adc5b0a536d8858ec395c;hb=22f04b9fac14adc3d3fc98273ba126c3a51792c3;hpb=f1ea1df6ff4652bb89b232cb5fd5762c6fea4dcf

diff --git a/etc/sv/nginx/configure.sh b/etc/sv/nginx/configure.sh
index ad988a2..a44c647 100644
--- a/etc/sv/nginx/configure.sh
+++ b/etc/sv/nginx/configure.sh
@@ -1,10 +1,10 @@
-rule runit_sv_configure php5-fpm '*'
-rule runit_sv_restart   php5-fpm
+rule _runit_sv_configure php5-fpm '*'
+rule _runit_sv_restart   php5-fpm
 rule apt_get_install nginx spawn-fcgi fcgiwrap
 rule insserv_remove  nginx
 rule insserv_remove fcgiwrap
 
-rule www_configure
+rule _www_configure
 
 sudo install -d -m 770 -o www -g www \
  /etc/nginx \
@@ -53,25 +53,36 @@ 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"
-	test -L /home/www/pub/"$site" ||
+	sudo test -L /home/www/pub/"$site" ||
 	sudo install -d -m 2770 -o www-"$site" -g www-"$site" \
 	 /home/www/pub/"$site"
 	sudo adduser www-data www-"$site"
 	sudo adduser www-data log-www-"$site"
 	sudo install -m 660 -o www -g www \
 	 "$tool"/etc/nginx/site.d/"$site"/local.conf \
-	        /etc/nginx/site.d/"$site"/local.inc
+	        /etc/nginx/site.d/"$site"/local.conf
+	test ! -e "$tool"/etc/nginx/site.d/"$site"/http.conf ||
 	sudo install -m 660 -o www -g www \
-	 "$tool"/etc/nginx/site.d/"$site"/site.conf \
-	        /etc/nginx/site.d/"$site"/site.inc
+	 "$tool"/etc/nginx/site.d/"$site"/http.conf \
+	        /etc/nginx/site.d/"$site"/http.conf
+	if test -L "$tool"/etc/nginx/site.d/"$site"/site.conf
+	 then
+		sudo cp --force --preserve=links --no-dereference \
+		 "$tool"/etc/nginx/site.d/"$site"/site.conf \
+		        /etc/nginx/site.d/"$site"/site.conf
+	 else
+		sudo install -m 660 -o www -g www \
+		 "$tool"/etc/nginx/site.d/"$site"/site.conf \
+		        /etc/nginx/site.d/"$site"/site.conf
+	 fi
 	sudo install -m 660 -o www -g www /dev/stdin \
 	 /etc/nginx/site.d/"$site"/server.conf <<-EOF
 		server {
-			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;
-			include             /etc/nginx/site.d/$site/local.inc;
-			include             /etc/nginx/site.d/$site/site.inc;
+			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;
+			include    /etc/nginx/site.d/$site/local.conf;
+			include    /etc/nginx/site.d/$site/site.conf;
 		 }
 		EOF
 	(