Merge pull request #195 from YunoHost-Apps/1.5.0

1.5.0
2024-09-03 18:36:24 +02:00 · 2022-09-13 22:51:53 +02:00 · 2022-09-13 22:51:53 +02:00 · 54abbdc131
commit 54abbdc131
parent 1acf9723e7 d0241ead4f
10 changed files with 36 additions and 50 deletions
--- a/README.md
+++ b/README.md
@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in

 Flarum is a simple discussion platform for your website. It's fast and easy to use, with all the features you need to run a successful community.

-**Shipped version:** 1.4.0~ynh2
+**Shipped version:** 1.5.0~ynh1


 **Demo:** https://discuss.flarum.org/d/21101-demos-come-to-flarum
--- a/README_fr.md
+++ b/README_fr.md
@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour

 Flarum est une plate-forme de discussion simple pour votre site Web. C'est rapide et facile à utiliser, avec toutes les fonctionnalités dont vous avez besoin pour gérer une communauté.

-**Version incluse :** 1.4.0~ynh2
+**Version incluse :** 1.5.0~ynh1


 **Démo :** https://discuss.flarum.org/d/21101-demos-come-to-flarum
--- a/20
+++ b/20
@ -6,7 +6,6 @@
 		language="fr"
 		is_public=1
 		password="pass"
-		port="666"
 		title="Forum"
 	; Checks
 		pkg_linter=1
@ -16,27 +15,14 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-#		upgrade=1	from_commit=0d30809a2903544a660635f62a25bc6057ea2f15
-#		upgrade=1	from_commit=0175b7a3b0a551e14f39c65290d194ccc71cd6ee
-#		upgrade=1	from_commit=70e962faa875070b0fcc29f45cc70e2a51de76a6
-		upgrade=1	from_commit=b6a29ea2bb4c3d2b5aa2dd786d12b72844e88929
+		upgrade=1	from_commit=e2784eb0fbef9109f074f1b158ed4a8b46e261c3
 		backup_restore=1
 		multi_instance=1
-		port_already_use=0
 		change_url=1
 ;;; Options
 Email=
 Notification=none
 ;;; Upgrade options
-	; commit=0d30809a2903544a660635f62a25bc6057ea2f15
-		name=2021-02-19 0.1.0.14~ynh2
-		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&title=Forum&
-	; commit=0175b7a3b0a551e14f39c65290d194ccc71cd6ee
-		name=2021-03-21 0.1.0.14~ynh3
-		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&password=PASSWORD&language=fr&is_public=1&title=Forum&
-	; commit=70e962faa875070b0fcc29f45cc70e2a51de76a6
-		name=2021-05-06 0.1.0.16~ynh2
-		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&password=PASSWORD&language=fr&is_public=1&title=Forum&
-	; commit=b6a29ea2bb4c3d2b5aa2dd786d12b72844e88929
-		name=2021-11-12 fixed 1.0
+	; commit=e2784eb0fbef9109f074f1b158ed4a8b46e261c3
+		name= Merge pull request #191 from YunoHost-Apps/testing
 		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&password=PASSWORD&language=fr&is_public=1&title=Forum&
--- a/conf/app.src
+++ b/conf/app.src
@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/flarum/flarum/archive/v1.4.0.zip
-SOURCE_SUM=7d8a529d0e83a17a4d97304d78446c1e5c192b7c979cb88c272d3f0a77646b90
+SOURCE_URL=https://github.com/flarum/flarum/archive/v1.5.0.zip
+SOURCE_SUM=f6bc6895e1b174384401ba1eff6d86c732b8991240b701ce5cdeb47ef5856cfe
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
--- a/conf/configuration.yml
+++ b/conf/configuration.yml
@ -1,8 +1,8 @@
 baseUrl : "https://__DOMAIN____PATH__"
 databaseConfiguration :
    host : "localhost"
-    database : "__USER__"
-    username : "__USER__"
+    database : "__DB_NAME__"
+    username : "__DB_USER__"
    password : "__DB_PWD__"
 adminUser :
    username : "__ADMIN__"
--- a/manifest.json
+++ b/manifest.json
@ -7,7 +7,7 @@
        "fr": "Forum de nouvelle génération, simplement",
        "de": "Forum der nächsten Generation leicht gemacht"
    },
-    "version": "1.4.0~ynh2",
+    "version": "1.5.0~ynh1",
    "url": "http://flarum.org/",
    "upstream": {
        "license": "MIT",
@ -27,7 +27,7 @@
    "multi_instance": true,
    "services": [
        "nginx",
-        "php7.3-fpm",
+        "php7.4-fpm",
        "mysql"
    ],
    "arguments": {
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@ -13,7 +13,7 @@ extra_php_dependencies="php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-dom php
 pkg_dependencies="$extra_php_dependencies"

 # Version numbers
-project_version="1.4.0"
+project_version="1.5.0"
 #core_version is now retrieved from the manifest
 ldap_version="*"

--- a/scripts/install
+++ b/scripts/install
@ -102,14 +102,6 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"

-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Configuring NGINX web server..."
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
@ -119,6 +111,14 @@ ynh_script_progression --message="Configuring PHP-FPM..."
 ynh_add_fpm_config --usage=low --footprint=low
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)

+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Configuring NGINX web server..."
+
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
 #=================================================
 # SPECIFIC SETUP
 #=================================================
--- a/scripts/restore
+++ b/scripts/restore
@ -45,20 +45,13 @@ test ! -d $final_path \

 #=================================================
 # STANDARD RESTORATION STEPS
-#=================================================
-# RESTORE THE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring the NGINX configuration..."
-
-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-
 #=================================================
 # RECREATE THE DEDICATED USER
 #=================================================
 ynh_script_progression --message="Recreating the dedicated system user..." --weight=1

 # Create the dedicated user (if not existing)
-ynh_system_user_create --username=$app
+ynh_system_user_create --username=$app --home_dir=$final_path

 #=================================================
 # RESTORE THE APP MAIN DIR
@ -91,6 +84,13 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 # Recreate a dedicated php-fpm config
 ynh_add_fpm_config --usage=low --footprint=low

+#=================================================
+# RESTORE THE NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Restoring the NGINX configuration..."
+
+ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
+
 #=================================================
 # RESTORE THE MYSQL DATABASE
 #=================================================
--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -137,14 +137,6 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"

-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
 #=================================================
 # UPGRADE DEPENDENCIES
 #=================================================
@ -161,6 +153,14 @@ ynh_script_progression --message="Upgrading php-fpm configuration..." --weight=1
 ynh_add_fpm_config --usage=low --footprint=low
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)

+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
+
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
 #=================================================
 # SPECIFIC UPGRADE
 #=================================================