From: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Date: Fri, 16 Jan 2015 18:05:17 +0000 (+0100)
Subject: Modifications :         etc/nginx/site.d/changedechaine-www/ -> etc/nginx/site.d... 
X-Git-Url: http://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=commitdiff_plain;h=fbca2cb7a375a364b7a1a69e8db3fb5b645cf507

Modifications :         etc/nginx/site.d/changedechaine-www/ -> etc/nginx/site.d/cdc-www/
---

diff --git a/etc/nginx/site.d/cdc-www-tls/local.conf b/etc/nginx/site.d/cdc-www-tls/local.conf
new file mode 100644
index 0000000..0e522a4
--- /dev/null
+++ b/etc/nginx/site.d/cdc-www-tls/local.conf
@@ -0,0 +1,4 @@
+listen 443;
+include /etc/nginx/conf.d/ssl.conf;
+ssl_certificate     /etc/nginx/x509.d/changedechaine-www-tls/crt.pem;
+ssl_certificate_key /etc/nginx/x509.d/changedechaine-www-tls/key.pem;
diff --git a/etc/nginx/site.d/cdc-www-tls/local.sh b/etc/nginx/site.d/cdc-www-tls/local.sh
new file mode 100644
index 0000000..a159622
--- /dev/null
+++ b/etc/nginx/site.d/cdc-www-tls/local.sh
@@ -0,0 +1,10 @@
+hint="run before: remote/runit-configure nginx -- $site"
+assert "sudo test -f /etc/nginx/x509.d/\"$site\"/key.pem" hint
+
+sudo install -m 664 -o www -g www \
+ "$tool"/var/pub/x509/www.changedechaine.org/crt+ca.pem \
+ /etc/nginx/x509.d/"$site"/crt.pem
+
+sudo rmdir ~www-data/"$site" || true
+sudo ln -fns "${site%-tls}" ~www-data/"$site"
+
diff --git a/etc/nginx/site.d/cdc-www-tls/site.conf b/etc/nginx/site.d/cdc-www-tls/site.conf
new file mode 120000
index 0000000..45b1931
--- /dev/null
+++ b/etc/nginx/site.d/cdc-www-tls/site.conf
@@ -0,0 +1 @@
+../cdc-www/site.conf
\ No newline at end of file
diff --git a/etc/nginx/site.d/cdc-www-tls/x509_host b/etc/nginx/site.d/cdc-www-tls/x509_host
new file mode 100644
index 0000000..a96e713
--- /dev/null
+++ b/etc/nginx/site.d/cdc-www-tls/x509_host
@@ -0,0 +1 @@
+www.changedechaine.org
diff --git a/etc/nginx/site.d/cdc-www/http.conf b/etc/nginx/site.d/cdc-www/http.conf
new file mode 100644
index 0000000..546b59f
--- /dev/null
+++ b/etc/nginx/site.d/cdc-www/http.conf
@@ -0,0 +1,7 @@
+server {
+	listen 80;
+	server_name
+	 changedechaine.org;
+
+	return 301 http://futur.changedechaine.org$request_uri;
+ }
diff --git a/etc/nginx/site.d/cdc-www/local.conf b/etc/nginx/site.d/cdc-www/local.conf
new file mode 100644
index 0000000..56b9f1c
--- /dev/null
+++ b/etc/nginx/site.d/cdc-www/local.conf
@@ -0,0 +1 @@
+listen 80;
diff --git a/etc/nginx/site.d/cdc-www/local.sh b/etc/nginx/site.d/cdc-www/local.sh
new file mode 100644
index 0000000..fdea1a3
--- /dev/null
+++ b/etc/nginx/site.d/cdc-www/local.sh
@@ -0,0 +1,19 @@
+pool=cdc_www
+sudo adduser php_"$pool" www-"$site"
+sudo adduser www-"$site" sftp
+
+sudo rmdir ~www-data/"$site" || true
+sudo install -d -m 2750 -o root -g www-"$site" \
+ ~www-data/"$site"
+sudo install -d -m 2750 -o www-"$site" -g www-"$site" \
+ ~www-data/"$site"/etc \
+ ~www-data/"$site"/etc/ssh
+sudo install -d -m 2770 -o www-"$site" -g www-"$site" \
+ ~www-data/"$site"/www
+
+"$tool"/local/runit-sv-start mysql
+while ! sudo mysql -u root </dev/null
+do sleep 1; done
+
+"$tool"/local/mysql-user-create     php_"$pool"
+"$tool"/local/mysql-database-create php_"$pool"
diff --git a/etc/nginx/site.d/cdc-www/site.conf b/etc/nginx/site.d/cdc-www/site.conf
new file mode 100644
index 0000000..ff7aa15
--- /dev/null
+++ b/etc/nginx/site.d/cdc-www/site.conf
@@ -0,0 +1,61 @@
+server_name
+    changedechaine.heureux-cyclage.org
+    changedechaine.org
+    futur.changedechaine.org
+    www.changedechaine.org;
+root /home/www/data/cdc-www/www;
+
+rewrite /wp-admin$ $scheme://$host$uri/ permanent;
+	# Add trailing slash to */wp-admin requests.
+location = /wp-admin/ {
+	return 301 /wp-admin/index.php?$args;
+ }
+location / {
+	index index.html index.htm index.php;
+	try_files $uri $uri/ /index.php?$args;
+ }
+location ~* ^.+\.(css|gif|html|ico|jpeg|js|jpg|png|txt|xml)$ {
+	access_log off;
+	expires 30d;
+	log_not_found off;
+ }
+location ~ /\. {
+	access_log off;
+	deny all;
+	log_not_found off;
+ }
+location ~ \.php(|/.+)$ {
+	include /etc/nginx/conf.d/fastcgi.conf;
+	set $no_cache "0";
+	if ($request_method !~ ^(GET|HEAD)$) {
+	 # NOTE: if non GET/HEAD, don't cache and mark user as uncacheable for 1 second via cookie.
+		set $no_cache "1";
+	 }
+	if ($no_cache = "1") {
+	 # NOTE: drop no cache cookie if need be (for some reason, add_header fails if included in prior if-block).
+		add_header Set-Cookie "_mcnc=1; Max-Age=2; Path=/";
+		add_header X-Microcachable "0";
+	 }
+	if ($http_cookie ~* "_mcnc") {
+	 # NOTE: bypass cache if no-cache cookie is set
+		set $no_cache "1";
+	 }
+	fastcgi_cache_bypass $no_cache;
+	fastcgi_cache_use_stale updating;
+	fastcgi_cache_valid 200 10s;
+	fastcgi_cache_valid 404 10m;
+	fastcgi_ignore_headers Cache-Control Expires Set-Cookie;
+	fastcgi_index index.php;
+	fastcgi_no_cache $no_cache;
+	fastcgi_param REDIRECT_STATUS 200;
+		# NOTE: PHP only, required if PHP was built with --enable-force-cgi-redirect
+	fastcgi_pass_header Cookie;
+	fastcgi_pass_header Set-Cookie;
+	fastcgi_split_path_info ^(.+\.php)(/.+)$;
+	try_files $fastcgi_script_name =404;
+		# Check for path info security issue
+
+	
+	fastcgi_pass unix:/run/php5/fpm/cdc_www;
+ }
+# vim: ft=sh
diff --git a/etc/nginx/site.d/changedechaine-www-tls/local.conf b/etc/nginx/site.d/changedechaine-www-tls/local.conf
deleted file mode 100644
index 0e522a4..0000000
--- a/etc/nginx/site.d/changedechaine-www-tls/local.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-listen 443;
-include /etc/nginx/conf.d/ssl.conf;
-ssl_certificate     /etc/nginx/x509.d/changedechaine-www-tls/crt.pem;
-ssl_certificate_key /etc/nginx/x509.d/changedechaine-www-tls/key.pem;
diff --git a/etc/nginx/site.d/changedechaine-www-tls/local.sh b/etc/nginx/site.d/changedechaine-www-tls/local.sh
deleted file mode 100644
index a159622..0000000
--- a/etc/nginx/site.d/changedechaine-www-tls/local.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-hint="run before: remote/runit-configure nginx -- $site"
-assert "sudo test -f /etc/nginx/x509.d/\"$site\"/key.pem" hint
-
-sudo install -m 664 -o www -g www \
- "$tool"/var/pub/x509/www.changedechaine.org/crt+ca.pem \
- /etc/nginx/x509.d/"$site"/crt.pem
-
-sudo rmdir ~www-data/"$site" || true
-sudo ln -fns "${site%-tls}" ~www-data/"$site"
-
diff --git a/etc/nginx/site.d/changedechaine-www-tls/site.conf b/etc/nginx/site.d/changedechaine-www-tls/site.conf
deleted file mode 120000
index 304dc2b..0000000
--- a/etc/nginx/site.d/changedechaine-www-tls/site.conf
+++ /dev/null
@@ -1 +0,0 @@
-../changedechaine-www/site.conf
\ No newline at end of file
diff --git a/etc/nginx/site.d/changedechaine-www-tls/x509_host b/etc/nginx/site.d/changedechaine-www-tls/x509_host
deleted file mode 100644
index a96e713..0000000
--- a/etc/nginx/site.d/changedechaine-www-tls/x509_host
+++ /dev/null
@@ -1 +0,0 @@
-www.changedechaine.org
diff --git a/etc/nginx/site.d/changedechaine-www/http.conf b/etc/nginx/site.d/changedechaine-www/http.conf
deleted file mode 100644
index 546b59f..0000000
--- a/etc/nginx/site.d/changedechaine-www/http.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-server {
-	listen 80;
-	server_name
-	 changedechaine.org;
-
-	return 301 http://futur.changedechaine.org$request_uri;
- }
diff --git a/etc/nginx/site.d/changedechaine-www/local.conf b/etc/nginx/site.d/changedechaine-www/local.conf
deleted file mode 100644
index 56b9f1c..0000000
--- a/etc/nginx/site.d/changedechaine-www/local.conf
+++ /dev/null
@@ -1 +0,0 @@
-listen 80;
diff --git a/etc/nginx/site.d/changedechaine-www/local.sh b/etc/nginx/site.d/changedechaine-www/local.sh
deleted file mode 100644
index 06a8b18..0000000
--- a/etc/nginx/site.d/changedechaine-www/local.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-pool=changedechaine_www
-sudo adduser php_"$pool" www-"$site"
-sudo adduser www-"$site" sftp
-
-sudo rmdir ~www-data/"$site" || true
-sudo install -d -m 2750 -o root -g www-"$site" \
- ~www-data/"$site"
-sudo install -d -m 2750 -o www-"$site" -g www-"$site" \
- ~www-data/"$site"/etc \
- ~www-data/"$site"/etc/ssh
-sudo install -d -m 2770 -o www-"$site" -g www-"$site" \
- ~www-data/"$site"/www
-
-"$tool"/local/runit-sv-start mysql
-while ! sudo mysql -u root </dev/null
-do sleep 1; done
-
-"$tool"/local/mysql-user-create     php_"$pool"
-"$tool"/local/mysql-database-create php_"$pool"
diff --git a/etc/nginx/site.d/changedechaine-www/site.conf b/etc/nginx/site.d/changedechaine-www/site.conf
deleted file mode 100644
index 2a359b9..0000000
--- a/etc/nginx/site.d/changedechaine-www/site.conf
+++ /dev/null
@@ -1,61 +0,0 @@
-server_name
-    changedechaine.heureux-cyclage.org
-    changedechaine.org
-    futur.changedechaine.org
-    www.changedechaine.org;
-root /home/www/data/changedechaine-www/www;
-
-rewrite /wp-admin$ $scheme://$host$uri/ permanent;
-	# Add trailing slash to */wp-admin requests.
-location = /wp-admin/ {
-	return 301 /wp-admin/index.php?$args;
- }
-location / {
-	index index.html index.htm index.php;
-	try_files $uri $uri/ /index.php?$args;
- }
-location ~* ^.+\.(css|gif|html|ico|jpeg|js|jpg|png|txt|xml)$ {
-	access_log off;
-	expires 30d;
-	log_not_found off;
- }
-location ~ /\. {
-	access_log off;
-	deny all;
-	log_not_found off;
- }
-location ~ \.php(|/.+)$ {
-	include /etc/nginx/conf.d/fastcgi.conf;
-	set $no_cache "0";
-	if ($request_method !~ ^(GET|HEAD)$) {
-	 # NOTE: if non GET/HEAD, don't cache and mark user as uncacheable for 1 second via cookie.
-		set $no_cache "1";
-	 }
-	if ($no_cache = "1") {
-	 # NOTE: drop no cache cookie if need be (for some reason, add_header fails if included in prior if-block).
-		add_header Set-Cookie "_mcnc=1; Max-Age=2; Path=/";
-		add_header X-Microcachable "0";
-	 }
-	if ($http_cookie ~* "_mcnc") {
-	 # NOTE: bypass cache if no-cache cookie is set
-		set $no_cache "1";
-	 }
-	fastcgi_cache_bypass $no_cache;
-	fastcgi_cache_use_stale updating;
-	fastcgi_cache_valid 200 10s;
-	fastcgi_cache_valid 404 10m;
-	fastcgi_ignore_headers Cache-Control Expires Set-Cookie;
-	fastcgi_index index.php;
-	fastcgi_no_cache $no_cache;
-	fastcgi_param REDIRECT_STATUS 200;
-		# NOTE: PHP only, required if PHP was built with --enable-force-cgi-redirect
-	fastcgi_pass_header Cookie;
-	fastcgi_pass_header Set-Cookie;
-	fastcgi_split_path_info ^(.+\.php)(/.+)$;
-	try_files $fastcgi_script_name =404;
-		# Check for path info security issue
-
-	
-	fastcgi_pass unix:/run/php5/fpm/changedechaine_www;
- }
-# vim: ft=sh