From 2b6fc8271b58b0045adc676f7f4a046158fafcfb Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackcrudelis@users.noreply.github.com>
Date: Tue, 9 Dec 2014 17:17:56 +0100
Subject: [PATCH 1/3] =?UTF-8?q?Sus=20=C3=A0=20la=20virgule=20rebelle!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index c52c72e..ecf96ba 100644
--- a/manifest.json
+++ b/manifest.json
@@ -63,10 +63,8 @@
                     "en": "Is it a public WordPress site ?",
                     "fr": "Est-ce un site public ?"
                 },
-                "choices": ["Yes", "No"],
+                "choices": ["Yes", "No"]
             }
-
-
         ]
     }
 }

From 770cde5d13e8e5a981f9838912ea347f6c909f96 Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackcrudelis@users.noreply.github.com>
Date: Sat, 13 Dec 2014 13:00:08 +0100
Subject: [PATCH 2/3] Update upgrade

---
 scripts/upgrade | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 35d5cf0..cde501e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -1,17 +1,18 @@
 #!/bin/bash
 
 # Retrieve arguments
-domain=$(sudo yunohost app setting wordpress domain)
-path=$(sudo yunohost app setting wordpress path)
-admin_wordpress=$(sudo yunohost app setting wordpress admin)
-language=$(sudo yunohost app setting wordpress language)
-is_public=$(sudo yunohost app setting wordpress is_public)
+domain=$(sudo yunohost app setting wordpressms domain)
+path=$(sudo yunohost app setting wordpressms path)
+admin_wordpress=$(sudo yunohost app setting wordpressms admin)
+language=$(sudo yunohost app setting wordpressms language)
+is_public=$(sudo yunohost app setting wordpressms is_public)
+multisite=$(sudo yunohost app setting wordpressms multisite)
 
 root_pwd=$(sudo cat /etc/yunohost/mysql)
 
-final_path=/var/www/wordpress
+final_path=/var/www/wordpressms
 
-db_name=wordpress
+db_name=wordpressms
 
 if [[ "$admin_wordpress" = "" ]];
 then
@@ -46,12 +47,12 @@ fi
 
 
 # Modify Nginx configuration file and copy it to Nginx conf directory
-sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf*
-sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/nginx.conf*
+sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf
+sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/nginx.conf
+
 
 if [ $is_public = "Yes" ];
 then
-    sudo cp ../conf/nginx.conf-public /etc/nginx/conf.d/$domain.d/wordpress.conf
     grep -q "define('FORCE_SSL_ADMIN', true);" $final_path/wp-config.php
     if [[ ! $? -eq 0 ]];
     then
@@ -60,8 +61,15 @@ then
         sudo sed -i "s@//define('FORCE_SSL_ADMIN@define('FORCE_SSL_ADMIN@g" $final_path/wp-config.php
     fi
 else
-    sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/wordpress.conf
+	sudo sed -i "s@#--PRIVATE--@@g" ../conf/nginx.conf
 fi
 
+if [ "$multisite" = "Yes" ];
+then
+    sudo sed -i "s@#--MULTISITE--@@g" ../conf/nginx.conf
+fi
+
+sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/wordpressms.conf
+
 # Reload Nginx
 sudo service nginx reload

From ab423514172376dddd7a5625d5ea5682cc8d74d0 Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackcrudelis@users.noreply.github.com>
Date: Sat, 13 Dec 2014 13:00:51 +0100
Subject: [PATCH 3/3] Ajout multisite dans le settings.yml

---
 scripts/install | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/install b/scripts/install
index 7fd9e94..466077c 100644
--- a/scripts/install
+++ b/scripts/install
@@ -19,6 +19,8 @@ fi
 sudo yunohost app setting wordpressms admin -v $admin_wordpress
 sudo yunohost app setting wordpressms language -v $language
 sudo yunohost app setting wordpressms is_public -v $is_public
+sudo yunohost app setting wordpressms multisite -v $multisite
+
 
 # Check domain/path availability
 sudo yunohost app checkurl $domain$path -a wordpressms