From: Julien Moutinho <julm+heureux-cyclage@autogeree.net>
Date: Thu, 18 Apr 2013 14:26:51 +0000 (+0200)
Subject: Modification : etc/sv/nginx/configure.sh : préserve les liens symboliques .
X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=commitdiff_plain;h=07f867bc5dc0e3bb3d01ceef80ce434e96642cba

Modification : etc/sv/nginx/configure.sh : préserve les liens symboliques .
---

diff --git a/etc/nginx/nginx.conf b/etc/nginx/nginx.conf
index 220c1f4..4be2606 100644
--- a/etc/nginx/nginx.conf
+++ b/etc/nginx/nginx.conf
@@ -83,5 +83,3 @@ http {
 pid /run/nginx.pid;
 user www-data;
 worker_processes 2;
-
-# vim: ft=sh
diff --git a/etc/sv/nginx/configure.sh b/etc/sv/nginx/configure.sh
index 7b2b546..2cfa7f7 100644
--- a/etc/sv/nginx/configure.sh
+++ b/etc/sv/nginx/configure.sh
@@ -60,18 +60,25 @@ for site in $(find "$tool"/etc/nginx/site.d \
 	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
-	sudo install -m 660 -o www -g www \
-	 "$tool"/etc/nginx/site.d/"$site"/site.conf \
-	        /etc/nginx/site.d/"$site"/site.inc
+	        /etc/nginx/site.d/"$site"/local.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
 	(