From fd083edc12e1fb9aa408e01bcd364132f21a15e9 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@paraiso.me>
Date: Sun, 3 Apr 2016 13:04:33 +0200
Subject: [PATCH] [enh] remove cookie-auth-mode specific setting that we don't
 use (fix #36)

---
 conf/config.inc.php | 7 ++++++-
 scripts/install     | 2 --
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/conf/config.inc.php b/conf/config.inc.php
index f940bcc..58d8bed 100644
--- a/conf/config.inc.php
+++ b/conf/config.inc.php
@@ -14,7 +14,12 @@
  * This is needed for cookie based authentication to encrypt password in
  * cookie
  */
-$cfg['blowfish_secret'] = 'YNH_COOKIE_PASSWD'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
+/* [YunoHost]
+ * We use the 'config' auth mode, so we don't care about settings
+ * specific to the 'cookie' auth mode
+ */
+$cfg['blowfish_secret'] = 'NOT_USED';
+
 
 /*
  * Servers configuration
diff --git a/scripts/install b/scripts/install
index 38cd234..9a86ac4 100644
--- a/scripts/install
+++ b/scripts/install
@@ -33,7 +33,6 @@ sudo cp  -r ../phpMyAdmin-$version-all-languages/* $final_path
 echo "Setting up database..."
 db_user=phpmyadmin
 db_pwd=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d 'A-Za-z0-9' | sed -n 's/\(.\{24\}\).*/\1/p')
-cookie_pwd=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d 'A-Za-z0-9' | sed -n 's/\(.\{24\}\).*/\1/p')
 sed -i "s@YNH_PMA_USER@$db_user@g" ../conf/create_db.sql
 sudo yunohost app initdb $db_user -p $db_pwd
 mysql -u root -p$(sudo cat /etc/yunohost/mysql) < ../conf/create_db.sql
@@ -46,7 +45,6 @@ sed -i "s@YNH_DOMAIN@$domain@g" ../conf/config.inc.php
 sed -i "s@YNH_PMA_USER@$db_user@g" ../conf/config.inc.php
 sed -i "s@YNH_PMA_PASSWORD@$db_pwd@g" ../conf/config.inc.php
 sed -i "s@YNH_MYSQL_ROOT_PASSWORD@$(sudo cat /etc/yunohost/mysql)@g" ../conf/config.inc.php
-sed -i "s@YNH_COOKIE_PASSWD@$cookie_pwd@g" ../conf/config.inc.php
 sudo cp ../conf/config.inc.php $final_path
 
 sudo yunohost app addaccess phpmyadmin -u $admin