From a7aa5c755dee20f70461c7c0a719baa11f666980 Mon Sep 17 00:00:00 2001
From: magikcypress <cyp@rouquin.me>
Date: Wed, 22 Feb 2017 14:50:29 +0100
Subject: [PATCH] =?UTF-8?q?Mes=5Foptions=20pour=20=C3=A9viter=20les=20redi?=
 =?UTF-8?q?rection=20302=20+=20conf=20nginx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf/mes_options.php |  3 ++
 conf/nginx.conf      | 71 +++++++++++++++++++++++++++++++-------------
 manifest.json        |  1 +
 scripts/install      |  1 +
 4 files changed, 55 insertions(+), 21 deletions(-)
 create mode 100644 conf/mes_options.php

diff --git a/conf/mes_options.php b/conf/mes_options.php
new file mode 100644
index 0000000..3b30597
--- /dev/null
+++ b/conf/mes_options.php
@@ -0,0 +1,3 @@
+<?php
+# Pour simuler une redirection Apache
+define('_SERVER_APACHE', 'false');
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 2ed3b7d..8dd7bf1 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -4,26 +4,55 @@
 #--MULTISITE--}
 
 location __PATHTOCHANGE__ {
-       alias __FINALPATH__/;
-       index index.php;
-       if (!-e $request_filename)
-       {
-              rewrite ^(.+)$ __PATHTOCHANGE__/index.php?q=$1 last;
-       }
-       if ($scheme = http) {
-             rewrite ^ https://$server_name$request_uri? permanent;
-       }
-       client_max_body_size 30m;
-       location ~ [^/]\.php(/|$) {
-           fastcgi_split_path_info ^(.+?\.php)(/.*)$;
-           fastcgi_pass unix:/var/run/php5-fpm-__NAMETOCHANGE__.sock;
-           fastcgi_index index.php;
-           include fastcgi_params;
-           fastcgi_param REMOTE_USER $remote_user;
-           fastcgi_param PATH_INFO $fastcgi_path_info;
-           fastcgi_param SCRIPT_FILENAME $request_filename;
-       }
+		alias __FINALPATH__/;
+		index index.php;
+		if (!-e $request_filename)
+		{
+			rewrite ^(.+)$ __PATHTOCHANGE__/index.php?q=$1 last;
+		}
+		if ($scheme = http) {
+			rewrite ^ https://$server_name$request_uri? permanent;
+		}
+		client_max_body_size 30m;
+		location ~^/(tmp|config)/{
+			return 403;
+		}
+		location ~* \.(jpg|jpeg|gif|css|png|js|ico|swf|mp3|pdf)$ {
+			# Le contenu statique, est signalé au navigateur comme étant
+			# à garder en cache une semaine. Si il y a un proxy sur la
+			# route, celui-ci est autorisé à faire une copie et à la
+			# cacher.
+			expires        1w; 
+			add_header  Cache-Control public;
+		}
+		location /spip {
+			# La configuration globale du site. Tout ce qui ne va dans
+			# aucune autre location vas ici.
 
-  #--PRIVATE--# Include SSOWAT user panel.
-  #--PRIVATE--include conf.d/yunohost_panel.conf.inc;
+			# Quelques fichiers standards générés par spip et devant être
+		 	# à des URL précises.
+			rewrite ^/([^/]*)/robots\.txt$    /spip.php?page=robots.txt    last;
+			rewrite ^/([^/]*)/favicon\.ico$   /spip.php?page=favicon.ico   last;
+			rewrite ^/([^/]*)/sitemap\.xml$   /spip.php?page=sitemap.xml   last;
+			rewrite ^/([^/]*)/mobile\.html$    /spip.php?page=mobile_uk   last;
+
+			try_files $uri $uri/ /spip.php?q=$uri&$args;
+		}   
+		location ~ [^/]\.php(/|$) {
+			fastcgi_split_path_info ^(.+?\.php)(/.*)$;
+			fastcgi_pass unix:/var/run/php5-fpm-__NAMETOCHANGE__.sock;
+			fastcgi_index index.php;
+			include fastcgi_params;
+			fastcgi_param REMOTE_USER $remote_user;
+			fastcgi_param PATH_INFO $fastcgi_path_info;
+			fastcgi_param SCRIPT_FILENAME $request_filename;
+
+			set $ecrire 0;
+			if ($uri ~ ^/ecrire.*) {
+				set $ecrire 1;
+			} 
+		}
+
+	#--PRIVATE--# Include SSOWAT user panel.
+	#--PRIVATE--include conf.d/yunohost_panel.conf.inc;
 }
diff --git a/manifest.json b/manifest.json
index 0b58a0f..f8219b2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,6 +6,7 @@
         "en": "SPIP - publishing system for the Internet",
         "fr": "SPIP - Système de publication pour l’Internet"
     },
+    "version": "1.0.3",
     "url": "http://www.spip.net/",
     "license": "free",
     "maintainer": {
diff --git a/scripts/install b/scripts/install
index a18cfb4..b3fd84a 100644
--- a/scripts/install
+++ b/scripts/install
@@ -65,6 +65,7 @@ sudo sed -i "s@__NAMETOCHANGE__@$app@g" /etc/nginx/conf.d/$domain.d/$app.conf
 POOL_FPM
 
 sudo cp ../conf/connect.php $final_path/config/connect.php
+sudo cp ../conf/mes_options.php $final_path/config/mes_options.php
 
 # Changer les variables du ficher de configuration de SPIP
 sudo sed -i "s/__DB_USER__/$db_user/g" $final_path/config/connect.php