Merge pull request #160 from dragondaddy/testing

Upstream upgrade

manifest.toml

@@ -5,13 +5,13 @@ name = "Hubzilla"
 description.en = "Decentralized publication platform and social network"
 description.fr = "Plateforme de publication décentralisée et un réseau social"
 
-version = "8.6.3~ynh1"
+version = "8.6.6~ynh1"
 
 maintainers = [""]
 
 [upstream]
 license = "MIT"
-website = "https://zotlabs.org/page/hubzilla/hubzilla-project"
+website = "https://hubzilla.org"
 code = "https://framagit.org/hubzilla/core"
 
 [integration]
@@ -48,12 +48,12 @@ ram.runtime = "50M"
 [resources]
     [resources.sources]
         [resources.sources.main]
-        url = "https://framagit.org/hubzilla/core/-/archive/8.6.3/core-8.6.3.tar.gz"
-        sha256 = "51ad07048232bbd9d497eda9b1890f69a20d9faee7a610b7e53850c5c6a134b7"
+        url = "https://framagit.org/hubzilla/core/-/archive/8.8.6/core-8.8.6.tar.gz"
+        sha256 = "02482d6a1a1a0e90c977afa6336309e282f8cb9a4c271a358f8e442af6adfcb3"
 
         [resources.sources.addons]
-        url = "https://framagit.org/hubzilla/addons/-/archive/8.6.3/addons-8.6.3.tar.gz"
-        sha256 = "4a3194af2333867a109135d9d2493f9f18aa8ec01402634e1e45303a89fbe40f"
+        url = "https://framagit.org/hubzilla/addons/-/archive/8.8.6/addons-8.8.6.tar.gz"
+        sha256 = "b559cd6a5d18a1ce038d948a1fd76e1e85580c30a6350a01e942b1271118552a"
 
     [resources.system_user]
 
@@ -63,7 +63,7 @@ ram.runtime = "50M"
     main.url = "/"
 
     [resources.apt]
-    packages = "php8.2-curl, php8.2-gd, php8.2-mysql, php8.2-pgsql, php8.2-mbstring, php8.2-xml, php8.2-zip, php8.2-cli, php8.2-imagick"
+    packages = "php8.2-curl, php8.2-gd, php8.2-mysql, php8.2-pgsql, php8.2-mbstring, php8.2-xml, php8.2-zip, php8.2-cli, php8.2-imagick, php8.2-gmp"
 
     packages_from_raw_bash = """
             if [[ "$database" == "mysql" ]]; then 

scripts/install

@@ -67,7 +67,7 @@ ynh_setup_source --dest_dir="$install_dir/addon" --source_id="addons"
 
 touch "$install_dir/php.log"
 mkdir -p "$install_dir/store"
-mkdir -p  "$install_dir/cache/smarty3"
+mkdir -p "$install_dir/cache/smarty3"
 
 chown -R $app:www-data "$install_dir"
 chmod -R 775 $install_dir/store $install_dir/cache
@@ -90,7 +90,7 @@ ynh_use_logrotate "$install_dir/php.log"
 ynh_add_fail2ban_config --logpath="$install_dir/php.log" --failregex="^.*auth\.php.*failed login attempt.*from IP <HOST>.*$" --max_retry="5"
 
 # Set up cron job
-ynh_add_config --template="../conf/poller-cron" --destination="/etc/cron.d/$app"
+ynh_add_config --template="poller-cron" --destination="/etc/cron.d/$app"
 chown root: "/etc/cron.d/$app"
 chmod 644 "/etc/cron.d/$app"
 
@@ -112,7 +112,7 @@ fi
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-ynh_add_config --template="../conf/htconfig.sample.php" --destination="$install_dir/.htconfig.php"
+ynh_add_config --template="htconfig.sample.php" --destination="$install_dir/.htconfig.php"
 
 ynh_store_file_checksum --file=$install_dir/.htconfig.php
 

scripts/upgrade

@@ -30,25 +30,25 @@ upgrade_type=$(ynh_check_app_version_changed)
 ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
 
 # If random_string doesn't exist, create it
-if [ -z "$random_string" ]; then
+if [ -z "${random_string:-}" ]; then
     random_string="$(ynh_string_random --length=48)"
     ynh_app_setting_set --app=$app --key=random_string --value=$random_string
 fi
 
 # If fpm_footprint doesn't exist, create it
-if [ -z "$fpm_footprint" ]; then
+if [ -z "${fpm_footprint:-}" ]; then
     fpm_footprint=low
     ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint
 fi
 
 # If fpm_free_footprint doesn't exist, create it
-if [ -z "$fpm_free_footprint" ]; then
+if [ -z "${fpm_free_footprint:-}" ]; then
     fpm_free_footprint=0
     ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint
 fi
 
 # If fpm_usage doesn't exist, create it
-if [ -z "$fpm_usage" ]; then
+if [ -z "${fpm_usage:-}" ]; then
     fpm_usage=low
     ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage
 fi
@@ -126,7 +126,7 @@ ynh_add_nginx_config
 ynh_script_progression --message="Upgrading cron job..." --weight=1
 
 # Set up cron job
-ynh_add_config --template="../conf/poller-cron" --destination="/etc/cron.d/$app"
+ynh_add_config --template="poller-cron" --destination="/etc/cron.d/$app"
 chown root: "/etc/cron.d/$app"
 chmod 644 "/etc/cron.d/$app"
 

tests.toml

@@ -19,11 +19,11 @@ test_format = 1.0
     # Commits to test upgrade from
     # -------------------------------
 
-    test_upgrade_from.7c4bcff615c9ea9e87b2d5bad110dc10b1921efc.name = "Upgrade from 8.4.1"
+    test_upgrade_from.3e89436957f5a6f9b426836d671ffbb133d7db62.name = "Upgrade from 8.6.3~ynh1"
 
     
 [with_postgresql]
 
     only = ["install.subdir"]
 
-    args.database="postgresql"
+    args.database="postgresql"