Upgrade of install/remove/upgrade scripts

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name": "rainloop",
+    "name": "Rainloop",
     "id": "rainloop",
     "description": {
         "en": "Lightweight webmail",
@@ -40,6 +40,15 @@
                 },
                 "choices": ["Yes", "No"],
                 "default": "Yes"
+	    },
+            {
+                "name": "dp_pwd",
+                "type": "password",
+                "ask": {
+                    "en": "Choose a password for rainloop MySQL database. Please note that the table and the user will be rainloop (used for carddav)",
+                    "fr": "Choisissez un mot de passe pour la base MySQL de phpBB. Veuillez noter que la table et l'utilisateur créés seront rainloop (utilisé pour carddav)"
+                },
+                "example": "my_strong_password"
 	    }
         ]
     }

scripts/install

@@ -15,16 +15,16 @@ if [[ ! $? -eq 0 ]]; then
     exit 1
 fi
 
-# Generate random DES key & password
+# Generate random password
-#deskey=$(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=$(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=$4
 
 # Use 'rainloop' as database name and user
-#db_user=rainloop
+db_user=$app
 
 # Initialize database and store mysql password for upgrade
-#sudo yunohost app initdb $db_user -p $db_pwd -s $(readlink -e ../sources/SQL/mysql.initial.sql)
+sudo yunohost app initdb $db_user -p $db_pwd
-#sudo yunohost app setting rainloop mysqlpwd -v $db_pwd
+sudo yunohost app setting rainloop mysqlpwd -v $db_pwd
 
 #mysql -u $db_user -p$db_pwd $db_user < ../sources/plugins/automatic_addressbook/SQL/mysql.initial.sql
 
@@ -42,19 +42,19 @@ sudo chown -R www-data:www-data $final_path
 # 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
-sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/rainloop.conf
+sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
 
-sed -i "s@NAMETOCHANGE@rainloop@g" ../conf/php-fpm.conf
+sed -i "s@NAMETOCHANGE@$app@g" ../conf/php-fpm.conf
-finalphpconf=/etc/php5/fpm/pool.d/rainloop.conf
+finalphpconf=/etc/php5/fpm/pool.d/$app.conf
 sudo cp ../conf/php-fpm.conf $finalphpconf
 sudo chown root: $finalphpconf
 sudo chmod 644 $finalphpconf
 
 # Make app public if necessary
-sudo yunohost app setting my_webapp is_public -v "$is_public"
+sudo yunohost app setting $app is_public -v "$is_public"
 if [ "$is_public" = "Yes" ];
 then
-    sudo yunohost app setting my_webapp skipped_uris -v "/"
+    sudo yunohost app setting $app skipped_uris -v "/"
 fi
 
 

scripts/remove

@@ -1,14 +1,16 @@
 #!/bin/bash
 
-#db_user=rainloop
+app=rainloop
-#db_name=rainloop
+
-#root_pwd=$(sudo cat /etc/yunohost/mysql)
+db_user=$app
+db_name=$app
+root_pwd=$(sudo cat /etc/yunohost/mysql)
 domain=$(sudo yunohost app setting rainloop domain)
 
-#mysql -u root -p $root_pwd -e "DROP DATABASE $db_name ; DROP USER $db_user@localhost ;"
+mysql -u root -p $root_pwd -e "DROP DATABASE $db_name ; DROP USER $db_user@localhost ;"
-sudo rm -rf /var/www/rainloop
+sudo rm -rf /var/www/$app
-sudo rm -f /etc/nginx/conf.d/$domain.d/rainloop.conf
+sudo rm -f /etc/nginx/conf.d/$domain.d/$app.conf
-sudo rm -f /etc/php5/fpm/pool.d/rainloop.conf
+sudo rm -f /etc/php5/fpm/pool.d/$app.conf
 
 sudo service php5-fpm restart
 sudo service nginx reload

scripts/upgrade

@@ -6,45 +6,30 @@ app=rainloop
 domain=$(sudo yunohost app setting $app domain)
 path=$(sudo yunohost app setting $app path)
 is_public=$(sudo yunohost app setting $app is_public)
-
+dp_pwd=$(sudo yunohost app setting rainloop mysqlpwd)
-
+db_user=$app
-# Check domain/path availability
-#sudo yunohost app checkurl $domain$path -a rainloop
-#if [[ ! $? -eq 0 ]]; then
-#    exit 1
-#fi
-
-# Generate random DES key & password
-#deskey=$(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=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d 'A-Za-z0-9' | sed -n 's/\(.\{24\}\).*/\1/p')
-
-# Use 'rainloop' as database name and user
-#db_user=rainloop
 
 # Initialize database and store mysql password for upgrade
-#sudo yunohost app initdb $db_user -p $db_pwd -s $(readlink -e ../sources/SQL/mysql.initial.sql)
+root_pwd=$(sudo cat /etc/yunohost/mysql)
-#sudo yunohost app setting rainloop mysqlpwd -v $db_pwd
+mysql -u root -p$root_pwd -e "DROP DATABASE $db_name ; DROP USER $db_user@localhost ;"
-
+sudo yunohost app initdb $db_user -p $db_pwd
-#mysql -u $db_user -p$db_pwd $db_user < ../sources/plugins/automatic_addressbook/SQL/mysql.initial.sql
 
 # Copy files to the right place
 final_path=/var/www/$app/rainloop/v/
 sudo rm -rf $final_path/*
-#sudo mkdir -p $final_path
 sudo cp -a ../sources/rainloop/v/* $final_path
 
 
 # Set permissions to rainloop directory
-# sudo mkdir -p $final_path/logs
+sudo chown -R www-data:www-data /var/www/$app
-sudo chown -R www-data:www-data $final_path
 
 # 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
-sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/rainloop.conf
+sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
 
 sed -i "s@NAMETOCHANGE@rainloop@g" ../conf/php-fpm.conf
-finalphpconf=/etc/php5/fpm/pool.d/rainloop.conf
+finalphpconf=/etc/php5/fpm/pool.d/$app.conf
 sudo cp ../conf/php-fpm.conf $finalphpconf
 sudo chown root: $finalphpconf
 sudo chmod 644 $finalphpconf