From 5468deb81dfe413afd6c2ca5b4ca527f065dd5e8 Mon Sep 17 00:00:00 2001
From: magikcypress <cyp@rouquin.me>
Date: Thu, 23 Mar 2017 16:15:03 +0100
Subject: [PATCH] =?UTF-8?q?On=20active=20SSL=20dans=20la=20configuration?=
 =?UTF-8?q?=20pour=20pouvoir=20acc=C3=A9der=20au=20site=20public?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf/nginx.conf | 2 +-
 scripts/_common | 1 -
 scripts/install | 6 ++++++
 scripts/upgrade | 2 ++
 4 files changed, 9 insertions(+), 2 deletions(-)
 delete mode 100644 scripts/_common

diff --git a/conf/nginx.conf b/conf/nginx.conf
index e276a61..f5225a1 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -27,7 +27,7 @@ location __PATHTOCHANGE__ {
 	add_header X-Download-Options noopen;
 	add_header X-Permitted-Cross-Domain-Policies none;
 
-	try_files $uri $uri/  /__PATHTOCHANGE__/index.php?q=$uri&$args;
+	try_files $uri $uri/  __PATHTOCHANGE__/index.php?q=$uri&$args;
 
 	# Old image system ?
 	rewrite ^/([0-9])(-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+.jpg$ /img/p/$1/$1$2$3.jpg last;
diff --git a/scripts/_common b/scripts/_common
deleted file mode 100644
index 98f55fd..0000000
--- a/scripts/_common
+++ /dev/null
@@ -1 +0,0 @@
-PRESTASHOP_SOURCE_URL="https://download.prestashop.com/download/releases/prestashop_1.7.0.5.zip"
\ No newline at end of file
diff --git a/scripts/install b/scripts/install
index 7e9ae59..18a1401 100644
--- a/scripts/install
+++ b/scripts/install
@@ -124,6 +124,12 @@ sudo rm -fr $final_path/install
 #=================================================
 sudo chown -R www-data: $final_path
 
+#=================================================
+# active ssl
+#=================================================
+mysql -u $db_user -p$db_pwd $db_user -e "UPDATE _ps_configuration SET value=1 WHERE name='PS_SSL_ENABLED';"
+mysql -u $db_user -p$db_pwd $db_user -e "INSERT INTO _ps_configuration (id_configuration, id_shop_group, id_shop, name, value, date_add, date_upd) VALUES (NULL, NULL, NULL, 'PS_SSL_ENABLED_EVERYWHERE', '1', NOW(), NOW());"
+
 #=================================================
 # Set /etc/hosts
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 3618e72..c6636bc 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -28,6 +28,8 @@ root_pwd=$(sudo cat /etc/yunohost/mysql)
 
 final_path=/var/www/$app
 
+SETUP_SOURCE
+
 db_name=$app
 
 # Modify Nginx configuration file and copy it to Nginx conf directory