Merge pull request #42 from YunoHost-Apps/testing

Testing

README.md

@@ -17,7 +17,9 @@ Version: **4.7.2**
 
 
 ## Hubzilla
-[Hubzilla](https://zotlabs.org/page/hubzilla/hubzilla-project)is a social networking platform built with control of your privacy at center stage. Your online communications can be as public as you wish or as private as you require. Private conversations, private photos, private videos. Your media isn't hidden behind an obscure URL which can be guessed, it is protected by state-of-the-art cross-domain authentication. What this all means for you: less drama.
+[Hubzilla](https://hub.libranet.de/directory?f=&global=1&pubforums=1) is a social networking platform built with control of your privacy at center stage. Your online communications can be as public as you wish or as private as you require. Private conversations, private photos, private videos. Your media isn't hidden behind an obscure URL which can be guessed, it is protected by state-of-the-art cross-domain authentication. What this all means for you: **less drama**.
+
+![](https://fediverse.party/img/screenshots/hubzilla-1.png)
 
 
 
@@ -26,36 +28,30 @@ Version: **4.7.2**
 - [X] Multi-instance
 - [X] Adeed php.log in the root folder for debugging php, with logrotate applied on it (can be accesssed by **admin->logs** and entering the **php.log**).
 - [X] Fail2ban
+- [X] Choose between **Mysql** and
+**PostgreSQL** database to be used for the Hubzilla while installation.
 
 
 
 ## Installation
-Before installing, read the [Hubzilla installation instructions](https://framagit.org/hubzilla/core/blob/master/install/INSTALL.txt) for important information about
+Before installing, read the [Hubzilla installation instructions](https://framagit.org/hubzilla/core/blob/master/install/INSTALL.txt) for important information about:
 
 
 ### Register a new domain and add it to YunoHost
 - Hubzilla requires a dedicated domain, so obtain one and add it using the YunoHost admin panel. **Domains -> Add domain**. As Hubzilla uses the full domain and is installed on the root, you can create a subdomain such as hubzilla.domain.tld. Don't forget to update your DNS if you manage them manually.
 
 
-#### YunoHost >= 2.5 :
+## Ldap Admin user rights, logs and failed database updates
-Once the dedicated domain has been added to YunoHost, go again to the admin panel, go to domains then select your domain and click on "Install Let's Encrypt certificate".
 
-### Install the Hubzilla application
+- **For admin rights**: When installation is complete, you will need to visit your new hub's page and login with the **admin account username** which was entered at the time of installation process. You should then be able to create your first channel and have the **admin rights** for the hub.
-Use the YunoHost admin panel to install Hubzilla by entering the GitHub repo address in the custom app URL
 
-		https://github.com/YunoHost-Apps/hubzilla_ynh
+- **For normal YunoHost users :** Normal LDAP users can login through Ldap authentication and create there channels.
 
-Make sure to your new domain created by the instruction in previous section as the application domain.
+- **Failing to get admin rights :** If the admin cannot access the admin settings at `https://hubzilla.example.com/admin` or you want to grant admin rights to any other user(s) on the hub, then you have to **manually add 4096** to the **account_roles** under **accounts** for that user in the **database through phpMYAdmin**.
 
-**For admin rights**: When installation is complete, you will need to visit your new hub's page and login with the **admin account username** which was entered at the time of installation process. You should then be able to create your first channel and have the admin rights for the hub.
+- **For logs :**  Go to **admin->logs** and enter the file name **php.log**.
 
-**For normal YunoHost users:** Normal LDAP users can login through Ldap authentication and create there channels.
+- **Failed Database after Upgrade :** Some times databse upgrade fails after version upgrade. You can go to hub  eg. `https://hubzilla.example.com/admin/dbsync/` and check the numbers of failled update. These updates will have to be ran manually by **phpMYAdmin**.
-
-**If the admin cannot access the admin settings:** If the admin cannot access the admin settings at `https://hubzilla.example.com/admin` or you want to grant admin rights to any other user(s) on the hub, then you have to **manually add 4096** to the **account_roles** under **accounts** for that user in the **database through phpMYAdmin**.
-
-**For logs:**: Go to **admin->logs** and enter the file name **php.log**. 
-
-**Failed Database after Upgrade:** Some times databse upgrade fails after version upgrade. You can go to hub  eg. `https://hubzilla.example.com/admin/dbsync/` and upgrade it manually.
 
 #### Supported architectures
 

check_process

@@ -7,7 +7,7 @@
 	; Manifest
 		domain="domain.tld"	(DOMAIN)
 		admin="john"	(USER)
-		upload="256M"
+		database="1"   (STRING)
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=0

conf/nginx.conf

@@ -26,7 +26,7 @@
 	location ~* \.php$
 	{
 	try_files $uri =404;
-    fastcgi_pass unix:/var/run/php/php7.0-fpm-__NAME__.sock;
+    fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock;
     fastcgi_index index.php;
     include fastcgi_params;
     fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
@@ -76,4 +76,3 @@
 	}
 
  }
-

conf/poller-cron

@@ -1,2 +1,2 @@
 # Run poller periodically to update Hubzilla
-*/10 * * * * __USER__ cd YNH_WWW_PATH; /usr/bin/php Zotlabs/Daemon/Master.php Cron > /dev/null 2>&1
+*/10 * * * * __USER__ cd YNH_WWW_PATH; /usr/bin/php__PHP_VERSION__ Zotlabs/Daemon/Master.php Cron > /dev/null 2>&1

manifest.json

@@ -8,24 +8,23 @@
     },
     "url": "https://zotlabs.org/page/hubzilla/hubzilla-project",
     "license": "MIT",
-    "version": "4.7.2~ynh1",
+    "version": "4.7.2~ynh2",
     "maintainer": {
         "name": "Anmol Sharma",
-        "email": "anmol@datamol.org",
+        "email": "anmol@datamol.org"
-        "url": "https://pod.datamol.org/channel/anmol"
     },
     "services": [
         "nginx",
-        "php5-fpm",
+        "php7.3-fpm",
-        "mysql"
+        "mysql",
+        "postgresql"
     ],
     "requirements": {
-        "yunohost": ">= 3.5"
+        "yunohost": ">= 3.8.1"
     },
     "previous_maintainers": {
         "name": "Andrew Manning",
-        "email": "andrew@reticu.li",
+        "email": "andrew@reticu.li"
-        "url": "https://hub.reticu.li/channel/andrewmanning"
         },
     "multi_instance": true,
     "arguments": {
@@ -34,7 +33,7 @@
                 "name": "domain",
                 "type": "domain",
                 "ask": {
-                    "en": "Choose a domain for your Hubzilla hub. Hubzilla must run in the root of this domain. It means no other app can be accessed/run from this domain. We advise to use a dedicated subdomain such as hubzilla.domain.tld",
+                    "en": "Choose a domain for your Hubzilla. Hubzilla must run in the root of this domain. It means no other app can be accessed/run from this domain. We advise to use a dedicated subdomain such as hubzilla.domain.tld",
                     "fr": "Indiquez un domain pour Hubzilla. Hubzilla doit être installé à la racine du domaine. Cela implique qu'aucune autre app ne pourra être installée ou accessible sur ce domain. Nous conseillons un sous-domaine dédié par exemple hubzilla.domain.tld."
                 }
             },
@@ -45,6 +44,16 @@
                     "en": "Choose the Hubzilla administrator (must be an existing YunoHost user)",
                     "fr": "Choisissez l'administrateur de Hubzilla (doit être un utilisateur YunoHost existant)"
                 }
-            }        ]
+            },
+            {
+                "name": "database",
+                "type": "string",
+                "ask": {
+                    "en": "Choose the database to be used for the Hubzilla [mysql:1,postgresql:2]",
+                    "fr": "Choisissez la database de l'Hubzilla [mysql:1,postgresql:2]"
+                },
+                "choices": ["1", "2"],
+                "default": "1"
+            }       ]
     }
 }

scripts/_common.sh

@@ -5,7 +5,11 @@
 #=================================================
 
 # dependencies used by the app
-pkg_dependencies="php-mbstring php-cli php-imagick php-xml php-zip"
+YNH_PHP_VERSION="7.3"
+
+extra_php_dependencies="php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-gd"
+# dependencies used by the app
+pkg_dependencies="postgresql postgresql-contrib"
 
 #=================================================
 # PERSONAL HELPERS

scripts/backup

@@ -24,50 +24,59 @@ ynh_abort_if_errors
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..." --time --weight=1
+ynh_script_progression --message="Loading installation settings..."
-
 app=$YNH_APP_INSTANCE_NAME
 
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
+phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
+database=$(ynh_app_setting_get --app=$app --key=database)
 
 #=================================================
 # STANDARD BACKUP STEPS
 #=================================================
 # BACKUP THE APP MAIN DIR
 #=================================================
-ynh_script_progression --message="Backing up the main app directory..." --time --weight=1
+ynh_script_progression --message="Backing up the main app directory..."
 
 ynh_backup --src_path="$final_path"
 
 #=================================================
 # BACKUP THE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Backing up nginx web server configuration..." --time --weight=1
+ynh_script_progression --message="Backing up nginx web server configuration..."
 
 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 #=================================================
 # BACKUP THE PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Backing up php-fpm configuration..." --time --weight=1
+ynh_script_progression --message="Backing up php-fpm configuration..."
 
-ynh_backup --src_path="/etc/php/7.0/fpm/pool.d/$app.conf"
+ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
 #=================================================
-# BACKUP THE MYSQL DATABASE
+# BACKUP OF THE  DATABASE
 #=================================================
-ynh_script_progression --message="Backing up the MySQL database..." --time --weight=1
+ynh_script_progression --message="Backing up the MySQL database..."
+
+if [  $database -eq 1 ]; then
+	ynh_script_progression --message="Backup of the  MySQL database..."
+	ynh_mysql_dump_db --database="$db_name" > db.sql
+elif [ $database -eq 2 ]; then
+	# Removing postgresql database
+	ynh_script_progression --message="Backup of the  postgresql database..."
+    ynh_psql_dump_db --database="$db_name" > db.sql
+fi
 
-ynh_mysql_dump_db --database="$db_name" > db.sql
 
 #=================================================
 # SPECIFIC BACKUP
 #=================================================
 # BACKUP LOGROTATE
 #=================================================
-ynh_script_progression --message="Backing up logrotate configuration..." --time --weight=1
+ynh_script_progression --message="Backing up logrotate configuration..."
 
 ynh_backup --src_path="/etc/logrotate.d/$app"
 
@@ -80,7 +89,7 @@ ynh_backup --src_path="/etc/cron.d/$app"
 #=================================================
 # BACKUP FAIL2BAN CONFIGURATION
 #=================================================
-ynh_script_progression --message="Backing up fail2ban configuration..." --time --weight=1
+ynh_script_progression --message="Backing up fail2ban configuration..."
 
 ynh_backup --src_path="/etc/fail2ban/jail.d/$app.conf"
 ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf"
@@ -89,4 +98,4 @@ ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf"
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." --time --last
+ynh_script_progression --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."

scripts/install

@@ -29,7 +29,8 @@ path_url="/"
 admin=$YNH_APP_ARG_ADMIN
 email=$(sudo yunohost user info $admin | grep "mail:" | cut -d' ' -f2)
 upload="256M"
-database="1"
+random_string="$(ynh_string_random)$(ynh_string_random)$(ynh_string_random)"
+database=`expr $YNH_APP_ARG_DATABASE`
 
 ### If it's a multi-instance app, meaning it can be installed several times independently
 ### The id of the app as stated in the manifest is available as $YNH_APP_ID
@@ -54,7 +55,7 @@ app=$YNH_APP_INSTANCE_NAME
 ### Use the execution time, given by --time, to estimate the weight of a step.
 ### A common way to do it is to set a weight equal to the execution time in second +1.
 ### The execution time is given for the duration since the previous call. So the weight should be applied to this previous call.
-ynh_script_progression --message="Validating installation parameters..." --time --weight=1
+ynh_script_progression --message="Validating installation parameters..."
 
 ### If the app uses nginx as web server (written in HTML/PHP in most cases), the final path should be "/var/www/$app".
 ### If the app provides an internal web server (or uses another application server such as uwsgi), the final path should be "/opt/yunohost/$app"
@@ -75,14 +76,14 @@ ynh_app_setting_set --app=$app --key=admin    --value=$admin
 ynh_app_setting_set --app=$app --key=email    --value=$email
 ynh_app_setting_set --app=$app --key=upload   --value=$upload
 ynh_app_setting_set --app=$app --key=database --value=$database
-
+ynh_app_setting_set --app=$app --key=random_string --value=$random_string
 
 #=================================================
 # STANDARD MODIFICATIONS
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Installing dependencies..." --time --weight=1
+ynh_script_progression --message="Installing dependencies..."
 
 ### `ynh_install_app_dependencies` allows you to add any "apt" dependencies to the package.
 ### Those deb packages will be installed as dependencies of this package.
@@ -92,33 +93,16 @@ ynh_script_progression --message="Installing dependencies..." --time --weight=1
 ###		- As well as the section "REINSTALL DEPENDENCIES" in the restore script
 ###		- And the section "UPGRADE DEPENDENCIES" in the upgrade script
 
-ynh_install_app_dependencies $pkg_dependencies
+if [ $database -eq 2 ]; then
-
+	ynh_install_app_dependencies $pkg_dependencies
-#=================================================
+fi
-# CREATE A MYSQL DATABASE
-#=================================================
-ynh_script_progression --message="Creating a MySQL database..." --time --weight=1
-
-### Use these lines if you need a database for the application.
-### `ynh_mysql_setup_db` will create a database, an associated user and a ramdom password.
-### The password will be stored as 'mysqlpwd' into the app settings,
-### and will be available as $db_pwd
-### If you're not using these lines:
-###		- Remove the section "BACKUP THE MYSQL DATABASE" in the backup script
-###		- Remove also the section "REMOVE THE MYSQL DATABASE" in the remove script
-###		- As well as the section "RESTORE THE MYSQL DATABASE" in the restore script
-
-db_name=$(ynh_sanitize_dbid --db_name=$app)
-db_user=$db_name
-ynh_app_setting_set --app=$app --key=db_name --value=$db_name
-ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
 
 # 1 - Hubzilla
-ynh_script_progression --message="Setting up Hubzilla source files..."  --time --weight=1
+ynh_script_progression --message="Setting up Hubzilla source files..."
 
 ### `ynh_setup_source` is used to install an app from a zip or tar.gz file,
 ### downloaded from an upstream source, like a git repository.
@@ -131,58 +115,97 @@ ynh_setup_source --dest_dir="$final_path"
 # 2 - Hubzilla Addons
 
 # Make addon Directory and unpack the Hubzilla addons to this directory
-ynh_script_progression --message="Create addon directory inside Hubzilla root folder..." --time --weight=1
+ynh_script_progression --message="Create addon directory inside Hubzilla root folder..."
 mkdir $final_path/addon
-ynh_script_progression --message="Setting up Hubzilla addons source files..." --time --weight=1
+ynh_script_progression --message="Setting up Hubzilla addons source files..."
+
 ynh_setup_source --dest_dir="$final_path/addon" --source_id="app_addons"
 
 
 # 3 - Some extra folders
-ynh_script_progression --message="Creating smarty3 folder for personal data..." --time --weight=1
+ynh_script_progression --message="Creating smarty3 folder for personal data..."
+
 mkdir -p "${final_path}/store/[data]/smarty3"
 chmod -R 777 $final_path/store
 
-# Import database schema
-ynh_script_progression --message="Importing database..." --time --weight=1
-ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" < $final_path/install/schema_mysql.sql
 
 # Copy the template install/htconfig.sample.php to .htconfig.php
-ynh_script_progression --message="Moving .htconfig.php to root of Hubzilla ..." --time --weight=1
+ynh_script_progression --message="Moving .htconfig.php to root of Hubzilla ..."
-cp $final_path/install/htconfig.sample.php $final_path/.htconfig.php
+config="$final_path/.htconfig.php"
+cp $final_path/install/htconfig.sample.php $config
 
 # Create php.log inside Hubzilla for logs
-ynh_script_progression --message="Create php.log for the Hubzilla debuging..." --time --weight=1
+ynh_script_progression --message="Create php.log for the Hubzilla debuging..."
 touch "$final_path/php.log"
 
+#=================================================
+# CREATE A  DATABASE
+#=================================================
+
+
+### Use these lines if you need a database for the application.
+### `ynh_mysql_setup_db` will create a database, an associated user and a ramdom password.
+### The password will be stored as 'mysqlpwd' into the app settings,
+### and will be available as $db_pwd
+### If you're not using these lines:
+###		- Remove the section "BACKUP THE MYSQL DATABASE" in the backup script
+###		- Remove also the section "REMOVE THE MYSQL DATABASE" in the remove script
+###		- As well as the section "RESTORE THE MYSQL DATABASE" in the restore script
+
+if [  $database -eq 1 ]; then
+	ynh_script_progression --message="Creating a MySQL database..."
+	db_name=$(ynh_sanitize_dbid --db_name=$app)
+	db_user=$db_name
+	ynh_app_setting_set --app=$app --key=db_name --value=$db_name
+	ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name
+	ynh_script_progression --message="Importing database..."
+	ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" < $final_path/install/schema_mysql.sql
+elif [ $database -eq 2 ]; then
+	# Create postgresql database
+	ynh_script_progression --message="Creating a postgresql database..."
+	ynh_replace_string --match_string="db_type = 0;" --replace_string="db_type = 1;" --target_file="$config"
+	db_name=$(ynh_sanitize_dbid --db_name=$app)
+	db_user=$app
+	ynh_psql_test_if_first_run
+	ynh_psql_setup_db --db_user=$db_user --db_name=$db_name
+	ynh_app_setting_set --app=$app --key=db_name --value=$db_name
+	ynh_script_progression --message="Importing database..."
+	ynh_psql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" < $final_path/install/schema_postgres.sql
+else
+	ynh_die --message="Some problem occured in creating the database, contact maintainer"
+
+fi
+
 #=================================================
 # MODIFY A CONFIG FILE
 #=================================================
 
 ### `ynh_replace_string` is used to replace a string in a file.
 ### (It's compatible with sed regular expressions syntax)
-
+phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
-sed -i "s/your.mysqlhost.com/localhost/g" $final_path/.htconfig.php
+ynh_replace_string --match_string="your.mysqlhost.com" --replace_string="localhost" --target_file="$config"
-sed -i "s/mysqlpassword/$db_pwd/g" $final_path/.htconfig.php
+ynh_replace_string --match_string= "mysqlpassword" --replace_string="$db_pwd" --target_file="$config"
-sed -i "s/mysqlusername/$db_name/g" $final_path/.htconfig.php
+ynh_replace_string --match_string="mysqlusername" --replace_string="$db_name" --target_file="$config"
-sed -i "s/mysqldatabasename/$db_name/g" $final_path/.htconfig.php
+ynh_replace_string --match_string= "mysqldatabasename" --replace_string="$db_name" --target_file="$config"
-sed -i "s/mysite.example/$domain/g" $final_path/.htconfig.php
+ynh_replace_string --match_string= "mysite.example" --replace_string="$domain" --target_file="$config"
-sed -i "s/if the auto install failed, put a unique random string here/$(ynh_string_random)$(ynh_string_random)$(ynh_string_random)/g" $final_path/.htconfig.php
+ynh_replace_string --match_string= "if the auto install failed, put a unique random string here" --replace_string="$random_string" --target_file="$config"
-sed -i "s/\['admin_email'\] = '';/\['admin_email'\] = '$email';/g" $final_path/.htconfig.php
+sed -i "s/\['admin_email'\] = '';/\['admin_email'\] = '$email';/g" "$config"
-sed -i "s@//error_reporting(E_ERROR | E_WARNING | E_PARSE );@error_reporting(E_ERROR | E_WARNING | E_PARSE );@g" $final_path/.htconfig.php
+ynh_replace_string --match_string= "//error_reporting(E_ERROR | E_WARNING | E_PARSE );" --replace_string="error_reporting(E_ERROR | E_WARNING | E_PARSE );" --target_file="$config"
-sed -i "s@//ini_set('error_log','php.out');@ini_set('error_log','php.log');@g" $final_path/.htconfig.php
+ynh_replace_string --match_string= "//ini_set('error_log','php.out');" --replace_string="ini_set('error_log','php.log');" --target_file="$config"
-sed -i "s@//ini_set('log_errors','1');@ini_set('log_errors','1');@g" $final_path/.htconfig.php
+ynh_replace_string --match_string= "//ini_set('log_errors','1');" --replace_string="ini_set('log_errors','1');" --target_file="$config"
-sed -i "s@//ini_set('display_errors', '0');@ini_set('display_errors', '0');@g" $final_path/.htconfig.php
+ynh_replace_string --match_string= "//ini_set('display_errors', '0');" --replace_string="ini_set('display_errors', '0');" --target_file="$config"
+sed -i "s/\['php_path'\] = 'php';/\['php_path'\] = 'php$phpversion';/g" "$config"
 
 # addon ldap config
-ynh_script_progression --message="Push Ldap configuration to .htconfig.php..." --time --weight=1
+ynh_script_progression --message="Push Ldap configuration to .htconfig.php..."
-sudo su -c "cat ../conf/ldap_conf.php >> $final_path/.htconfig.php"
+
+cat ../conf/ldap_conf.php >> $final_path/.htconfig.php
 
 
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring nginx web server..." --time --weight=1
+ynh_script_progression --message="Configuring nginx web server..."
-
 ### `ynh_add_nginx_config` will use the file conf/nginx.conf
 
 # Create a dedicated nginx config
@@ -191,7 +214,7 @@ ynh_add_nginx_config
 #=================================================
 # CREATE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Configuring system user..." --time --weight=1
+ynh_script_progression --message="Configuring system user..."
 
 # Create a system user
 ynh_system_user_create --username=$app
@@ -199,7 +222,7 @@ ynh_system_user_create --username=$app
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring php-fpm..." --time --weight=1
+ynh_script_progression --message="Configuring php-fpm..."
 
 ### `ynh_add_fpm_config` is used to set up a PHP config.
 ### You can remove it if your app doesn't use PHP.
@@ -213,16 +236,17 @@ ynh_script_progression --message="Configuring php-fpm..." --time --weight=1
 ###		- And the section "PHP-FPM CONFIGURATION" in the upgrade script
 
 # Create a dedicated php-fpm config
-ynh_add_fpm_config
+ynh_add_fpm_config --package="$extra_php_dependencies"
 
 # Set right permissions for Hubzilla
-ynh_script_progression --message="Set right for Hubzilla..." --time --weight=1
+ynh_script_progression --message="Set right for Hubzilla..."
 chown -R $app: $final_path
 
 # Set up cron job
-ynh_script_progression --message="Setting up cron job..."  --time --weight=1
+ynh_script_progression --message="Setting up cron job..."
 ynh_replace_string --match_string="YNH_WWW_PATH" --replace_string="$final_path"  --target_file="../conf/poller-cron"
 ynh_replace_string --match_string="__USER__" --replace_string="$app"  --target_file="../conf/poller-cron"
+ynh_replace_string --match_string="__PHP_VERSION__" --replace_string="$phpversion"  --target_file="../conf/poller-cron"
 cp ../conf/poller-cron /etc/cron.d/$app
 
 #=================================================
@@ -234,12 +258,12 @@ cp ../conf/poller-cron /etc/cron.d/$app
 ### you can make a backup of this file before modifying it again if the admin had modified it.
 
 # Calculate and store the config file checksum into the app settings
-ynh_store_file_checksum --file="$final_path/.htconfig.php"
+ynh_store_file_checksum --file="$config"
 
 #=================================================
 # SETUP LOGROTATE
 #=================================================
-ynh_script_progression --message="Configuring log rotation..." --time --weight=1
+ynh_script_progression --message="Configuring log rotation..."
 
 ### `ynh_use_logrotate` is used to configure a logrotate configuration for the logs of this app.
 ### Use this helper only if there is effectively a log file for this app.
@@ -255,20 +279,20 @@ ynh_use_logrotate "$final_path/php.log"
 #=================================================
 # SETUP FAIL2BAN
 #=================================================
-ynh_script_progression --message="Add Fail2Ban..." --time --weight=1
+ynh_script_progression --message="Add Fail2Ban..."
 ynh_add_fail2ban_config --logpath="$final_path/php.log" --failregex="^.*auth\.php.*failed login attempt.*from IP <HOST>.*$" --max_retry="5"
 
 #=================================================
 # SETUP SSOWAT
 #=================================================
 # As Hubzilla is social network and have its own permission there is no need to keep Hubzilla behind SSO
-ynh_script_progression --message="Configuring SSOwat..."  --time --weight=1
+ynh_script_progression --message="Configuring SSOwat..."
 ynh_app_setting_set --app=$app --key=unprotected_uris --value="/"
 
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading nginx web server..." --time --weight=1
+ynh_script_progression --message="Reloading nginx web server..."
 
 ynh_systemd_action --service_name=nginx --action=reload
 
@@ -276,4 +300,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Installation of $app completed" --time --last
+ynh_script_progression --message="Installation of $app completed"

scripts/remove

@@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..." --time --weight=1
+ynh_script_progression --message="Loading installation settings..."
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -20,23 +20,30 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user="$db_name"
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+database=$(ynh_app_setting_get --app=$app --key=database)
+
 
 #=================================================
 # STANDARD REMOVE
 #=================================================
 
 #=================================================
-# REMOVE THE MYSQL DATABASE
+# REMOVE THE DATABASE
 #=================================================
-ynh_script_progression --message="Removing the MySQL database..." --time --weight=1
+if [  $database -eq 1 ]; then
+	ynh_script_progression --message="Removing  MySQL database..."
+	ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name
+elif [ $database -eq 2 ]; then
+	# Removing postgresql database
+	ynh_script_progression --message="Removing  postgresql database..."
+    ynh_psql_remove_db --db_user=$db_user --db_name=$db_name
+fi
 
-# Remove a database if it exists, along with the associated user
-ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name
 
 #=================================================
 # REMOVE DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Removing dependencies..." --time --weight=1
+ynh_script_progression --message="Removing dependencies..."
 
 # Remove metapackage and its dependencies
 ynh_remove_app_dependencies
@@ -44,7 +51,7 @@ ynh_remove_app_dependencies
 #=================================================
 # REMOVE APP MAIN DIR
 #=================================================
-ynh_script_progression --message="Removing app main directory..." --time --weight=1
+ynh_script_progression --message="Removing app main directory..."
 
 # Remove the app directory securely
 ynh_secure_remove --file="$final_path"
@@ -52,7 +59,7 @@ ynh_secure_remove --file="$final_path"
 #=================================================
 # REMOVE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Removing nginx web server configuration..." --time --weight=1
+ynh_script_progression --message="Removing nginx web server configuration..."
 
 # Remove the dedicated nginx config
 ynh_remove_nginx_config
@@ -60,7 +67,7 @@ ynh_remove_nginx_config
 #=================================================
 # REMOVE PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Removing php-fpm configuration..." --time --weight=1
+ynh_script_progression --message="Removing php-fpm configuration..."
 
 # Remove the dedicated php-fpm config
 ynh_remove_fpm_config
@@ -68,7 +75,7 @@ ynh_remove_fpm_config
 #=================================================
 # REMOVE LOGROTATE CONFIGURATION
 #=================================================
-ynh_script_progression --message="Removing logrotate configuration..." --time --weight=1
+ynh_script_progression --message="Removing logrotate configuration..."
 
 # Remove the app-specific logrotate config
 ynh_remove_logrotate
@@ -84,6 +91,7 @@ ynh_secure_remove --file="/etc/cron.d/$app"
 #=================================================
 # REMOVE FAIL2BAN CONFIGURATION
 #=================================================
+ynh_script_progression --message="Removing fail2ban configuration..."
 
 ynh_remove_fail2ban_config
 
@@ -92,7 +100,7 @@ ynh_remove_fail2ban_config
 #=================================================
 # REMOVE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Removing the dedicated system user..." --time --weight=1
+ynh_script_progression --message="Removing the dedicated system user..."
 
 # Delete a system user
 ynh_system_user_delete --username=$app
@@ -101,4 +109,4 @@ ynh_system_user_delete --username=$app
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Removal of $app completed" --time --last
+ynh_script_progression --message="Removal of $app completed"

scripts/restore

@@ -24,7 +24,7 @@ ynh_abort_if_errors
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading settings..." --time --weight=1
+ynh_script_progression --message="Loading settings..."
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -33,11 +33,14 @@ path_url=$(ynh_app_setting_get --app=$app --key=path)
 admin=$(ynh_app_setting_get --app=$app --key=admin)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
+database=$(ynh_app_setting_get --app=$app --key=database)
+db_user=$db_name
+phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
 # CHECK IF THE APP CAN BE RESTORED
 #=================================================
-ynh_script_progression --message="Validating restoration parameters..." --time --weight=1
+ynh_script_progression --message="Validating restoration parameters..."
 
 ynh_webpath_available --domain=$domain --path_url=$path_url \
 	|| ynh_die --message="Path not available: ${domain}${path_url}"
@@ -55,19 +58,33 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
-ynh_script_progression --message="Restoring the app main directory..." --time --weight=1
+ynh_script_progression --message="Restoring the app main directory..."
 
 ynh_restore_file --origin_path="$final_path"
 
 #=================================================
 # RESTORE THE MYSQL DATABASE
 #=================================================
-ynh_script_progression --message="Restoring the MySQL database..." --time --weight=1
+ynh_script_progression --message="Restoring the MySQL database..." --time
+
+if [  $database -eq 1 ]; then
+	ynh_script_progression --message="Restoring  MySQL database..."
+	db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
+	ynh_mysql_setup_db --db_user=$db_name --db_name=$db_name --db_pwd=$db_pwd
+	ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name < ./db.sql
+elif [ $database -eq 2 ]; then
+	# Removing postgresql database
+	ynh_script_progression --message="Reinstalling dependencies..."
+	# Define and install dependencies
+	ynh_install_app_dependencies $pkg_dependencies
+	ynh_script_progression --message="Restoring the PostgreSQL database..."
+	db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
+	ynh_psql_test_if_first_run
+	ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
+	ynh_psql_execute_file_as_root --file="./db.sql" --database="$db_name"
+fi
 
 
-db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
-ynh_mysql_setup_db --db_user=$db_name --db_name=$db_name --db_pwd=$db_pwd
-ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name < ./db.sql
 
 
 #=================================================
@@ -81,19 +98,16 @@ ynh_system_user_create $app
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION
 #=================================================
+ynh_script_progression --message="Restoring PHP-FPM configuration..."
 
-ynh_restore_file --origin_path="/etc/php/7.0/fpm/pool.d/$app.conf"
+ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
+
+# Recreate a dedicated php-fpm config
+ynh_add_fpm_config --package="$extra_php_dependencies"
 
 #=================================================
 # SPECIFIC RESTORATION
 #=================================================
-# REINSTALL DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Reinstalling dependencies..." --time --weight=1
-
-# Define and install dependencies
-ynh_install_app_dependencies $pkg_dependencies
-
 #=================================================
 # RESTORE THE CRON FILE
 #=================================================
@@ -125,7 +139,7 @@ ynh_app_setting_set $app skipped_uris "/"
 #=================================================
 ynh_script_progression --message="Reloading nginx web server and php-fpm..." --time --weight=1
 
-ynh_systemd_action --service_name=php7.0-fpm --action=reload
+ynh_systemd_action --service_name=php$phpversion-fpm --action=reload
 ynh_systemd_action --service_name=nginx --action=reload
 
 #=================================================

scripts/upgrade

@@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation settings..." --time --weight=1
+ynh_script_progression --message="Loading installation settings..."
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -20,10 +20,10 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 upload=$(ynh_app_setting_get --app=$app --key=upload)
-db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
 version=$(grep STD_VERSION $final_path/boot.php |  cut -c 38- | rev | cut -c 5- | rev)
 last_update=$(grep  update_time: /etc/yunohost/apps/$app/settings.yml |  cut -c 14-)
+database=$(ynh_app_setting_get --app=$app --key=database)
+phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
@@ -39,7 +39,7 @@ fi
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================
-ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --time --weight=1
+ynh_script_progression --message="Backing up the app before upgrading (may take a while)..."
 
 # Backup the current version of the app
 ynh_backup_before_upgrade
@@ -80,7 +80,7 @@ fi
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
 
-ynh_script_progression --message="Upgrading source files..." --time --weight=1
+ynh_script_progression --message="Upgrading source files..."
 
 # Download, check integrity, uncompress and patch the source from app.src
 	ynh_setup_source --dest_dir="$final_path"
@@ -97,7 +97,7 @@ ynh_setup_source --dest_dir="$final_path/addon" --source_id="app_addons"
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Upgrading nginx web server configuration..." --time --weight=1
+ynh_script_progression --message="Upgrading nginx web server configuration..."
 
 # Create a dedicated nginx config
 ynh_add_nginx_config
@@ -105,7 +105,7 @@ ynh_add_nginx_config
 #=================================================
 # CREATE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Making sure dedicated system user exists..." --time --weight=1
+ynh_script_progression --message="Making sure dedicated system user exists..."
 
 # Create a dedicated user (if not existing)
 ynh_system_user_create --username=$app
@@ -119,26 +119,25 @@ chown -R $app: $final_path
 ynh_print_info "Upgrading php-fpm configuration..."
 
 # Create a dedicated php-fpm config
-ynh_add_fpm_config
+ynh_add_fpm_config --package="$extra_php_dependencies"
-
 
 ### Verify the checksum of a file, stored by `ynh_store_file_checksum` in the install script.
 ### And create a backup of this file if the checksum is different. So the file will be backed up if the admin had modified it.
-ynh_backup_if_checksum_is_different --file="$final_path/.htconfig.php"
+ynh_backup_if_checksum_is_different --file="$final_path/.htconfig.php.back"
 # Recalculate and store the checksum of the file for the next upgrade.
 ynh_store_file_checksum --file="$final_path/.htconfig.php"
 
 #=================================================
 # SETUP LOGROTATE
 #=================================================
-ynh_script_progression --message="Upgrading logrotate configuration..." --time --weight=1
+ynh_script_progression --message="Upgrading logrotate configuration..."
 
 # Use logrotate to manage app-specific logfile(s)
 ynh_use_logrotate --non-append
 
 # UPGRADE FAIL2BAN
 #=================================================
-ynh_script_progression --message="Reconfiguring fail2ban..." --time --weight=1
+ynh_script_progression --message="Re-configure fail2ban..."
 
 ynh_add_fail2ban_config --logpath="$final_path/php.log" --failregex="^.*auth\.php.*failed login attempt.*from IP <HOST>.*$" --max_retry="5"
 
@@ -146,35 +145,43 @@ ynh_add_fail2ban_config --logpath="$final_path/php.log" --failregex="^.*auth\.ph
 ynh_print_info "Setting up cron job..."
 ynh_replace_string  --match_string="YNH_WWW_PATH" --replace_string="$final_path" --target_file="../conf/poller-cron"
 ynh_replace_string --match_string="__USER__" --replace_string="$app"  --target_file="../conf/poller-cron"
-sudo cp ../conf/poller-cron /etc/cron.d/$app
+ynh_replace_string --match_string="__PHP_VERSION__" --replace_string="$phpversion"  --target_file="../conf/poller-cron"
+sudo cp -f ../conf/poller-cron /etc/cron.d/$app
 
 #=================================================
 # UPGRADE DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Upgrading dependencies..." --time --weight=1
+ynh_script_progression --message="Upgrading dependencies..."
+if [  $database -eq 1 ]; then
+	#=================================================
+	# CHECK VERSION FOR SPECIFIC MYSQL UPDATE
+	#=================================================
 
-ynh_install_app_dependencies $pkg_dependencies
+	# Check version and if this version was a fresh install push mysq query
+	db_name=$(ynh_app_setting_get --app=$app --key=db_name)
+	db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
+	if [ -z "$last_update" ] && [ "$version" == "3.8.4" ]; then
+		ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" < "../conf/sql/385.sql"
+	fi
 
-#=================================================
-# CHECK VERSION FOR SPECIFIC MYSQL UPDATE
-#=================================================
 
-# Check version and if this version was a fresh install push mysq query
+elif [ $database -eq 2 ]; then
-if [ -z "$last_update" ] && [ "$version" == "3.8.4" ]; then
+	ynh_install_app_dependencies $pkg_dependencies
-	ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" < "../conf/sql/385.sql"
 fi
 
+
+
 #=================================================
 # SETUP SSOWAT
 #=================================================
 # As Hubzilla is social network and have its own permission there is no need to keep Hubzilla behind SSO
-ynh_script_progression --message="Upgrading SSOwat configuration..." --time --weight=1
+ynh_script_progression --message="Upgrading SSOwat configuration..."
 ynh_app_setting_set --app=$app --key=unprotected_uris --value="/"
 
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading nginx web server..." --time --weight=1
+ynh_script_progression --message="Reloading nginx web server..."
 
 ynh_systemd_action --service_name=nginx --action=reload
 
@@ -182,4 +189,4 @@ ynh_systemd_action --service_name=nginx --action=reload
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Upgrade of $app completed" --time --last
+ynh_script_progression --message="Upgrade of $app completed"