From fc9f8d61671a702d377de213d2f840b157127359 Mon Sep 17 00:00:00 2001
From: polytan02 <polytan02@mcgva.org>
Date: Sun, 8 Mar 2015 19:20:27 +0000
Subject: [PATCH] Basic mysql pwd

---
 scripts/install        |  4 ++--
 scripts/install_backup | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/install b/scripts/install
index 88a859a..40064f7 100644
--- a/scripts/install
+++ b/scripts/install
@@ -18,8 +18,8 @@ if [[ ! $? -eq 0 ]]; then
 fi
 
 db_user=$app
-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')
-#db_pwd=$admin_pwd
+#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')
+db_pwd=$admin_pwd
 
 # Initialize database and store mysql password for upgrade
 sudo yunohost app initdb $db_user -p $db_pwd
diff --git a/scripts/install_backup b/scripts/install_backup
index 4a75f1a..1330ab2 100644
--- a/scripts/install_backup
+++ b/scripts/install_backup
@@ -77,7 +77,7 @@ echo -e "\n database";
 curl -kL -X POST \
 -H "Host: $domain" \
 --data-urlencode "img_imagick=/usr/bin" \
---data-urlencode "language=$lang" \
+--data-urlencode "language=en" \
 --data-urlencode "dbms=mysqli" \
 --data-urlencode "dbhost=localhost" \
 --data-urlencode "dbport=" \
@@ -98,7 +98,7 @@ curl -kL -X POST \
 --data-urlencode "admin_pass2=$admin_pwd" \
 --data-urlencode "board_email=$admin_email" \
 --data-urlencode "img_imagick=/usr/bin" \
---data-urlencode "language=$lang" \
+--data-urlencode "language=en" \
 --data-urlencode "dbms=mysqli" \
 --data-urlencode "dbhost=localhost" \
 --data-urlencode "dbport=" \
@@ -113,7 +113,7 @@ echo -e "\n config_file";
 curl -kL -X POST \
 -H "Host: $domain" \
 --data-urlencode "img_imagick=/usr/bin" \
---data-urlencode "language=$lang" \
+--data-urlencode "language=en" \
 --data-urlencode "dbms=mysqli" \
 --data-urlencode "dbhost=localhost" \
 --data-urlencode "dbport=" \
@@ -145,7 +145,7 @@ curl -kL -X POST \
 --data-urlencode "server_port=443" \
 --data-urlencode "script_path=$path" \
 --data-urlencode "img_imagick=/usr/bin" \
---data-urlencode "language=$lang" \
+--data-urlencode "language=en" \
 --data-urlencode "dbms=mysqli" \
 --data-urlencode "dbhost=localhost" \
 --data-urlencode "dbport=" \
@@ -164,7 +164,7 @@ curl -kL -X POST \
 echo -e "\n create database";
 curl -kL -X POST \
 -H "Host: $domain" \
---data-urlencode "language=$lang" \
+--data-urlencode "language=en" \
 --data-urlencode "dbms=mysqli" \
 --data-urlencode "dbhost=localhost" \
 --data-urlencode "dbport=" \