Merge pull request #191 from YunoHost-Apps/testing

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.3.1~ynh1
+**Shipped version:** 1.4.0~ynh1
 
 **Demo:** https://discuss.flarum.org/d/21101-demos-come-to-flarum
 

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.3.1~ynh1
+**Version incluse :** 1.4.0~ynh1
 
 **Démo :** https://discuss.flarum.org/d/21101-demos-come-to-flarum
 

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/flarum/flarum/archive/v1.3.0.zip
+SOURCE_URL=https://github.com/flarum/flarum/archive/v1.4.0.zip
-SOURCE_SUM=78955c2f34f32593738b6e1908b282bb92fe50c4e3d33b5492f46fc19309084e
+SOURCE_SUM=7d8a529d0e83a17a4d97304d78446c1e5c192b7c979cb88c272d3f0a77646b90
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true

conf/nginx.conf

@@ -4,10 +4,6 @@ location __PATH__/ {
     # Path to source
     alias __FINALPATH__/public/ ;
 
-    if ($scheme = http) {
-    rewrite ^ https://$server_name$request_uri? permanent;
-    }
-
     index index.php;
 
     # Bug in Nginx with locations and aliases (see http://stackoverflow.com/a/35102259 )

manifest.json

@@ -7,7 +7,7 @@
         "fr": "Forum de nouvelle génération, simplement",
         "de": "Forum der nächsten Generation leicht gemacht"
     },
-    "version": "1.3.1~ynh1",
+    "version": "1.4.0~ynh1",
     "url": "http://flarum.org/",
     "upstream": {
         "license": "MIT",

scripts/_common.sh

@@ -2,18 +2,18 @@
 # COMMON VARIABLES
 #=================================================
 
-# dependencies used by the app
-pkg_dependencies=""
-
 swap_needed=1024
 
+# PHP
 YNH_PHP_VERSION="7.3"
 YNH_COMPOSER_VERSION="2.0.13"
-
 extra_php_dependencies="php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-dom php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-pdo-mysql php${YNH_PHP_VERSION}-tokenizer php${YNH_PHP_VERSION}-zip"
 
+# dependencies used by the app
+pkg_dependencies="$extra_php_dependencies"
+
 # Version numbers
-project_version="1.3.0"
+project_version="1.4.0"
 #core_version is now retrieved from the manifest
 ldap_version="*"
 

scripts/install

@@ -116,7 +116,7 @@ ynh_add_nginx_config
 ynh_script_progression --message="Configuring PHP-FPM..."
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies"
+ynh_add_fpm_config --usage=low --footprint=low
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
@@ -126,7 +126,9 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 #=================================================
 ynh_print_info --message="Adding swap..."
 
-ynh_add_swap --size=$swap_needed
+if [ ${PACKAGE_CHECK_EXEC:-0} -eq 0 ]; then
+  ynh_add_swap --size=$swap_needed
+fi
 
 #=================================================
 # INSTALL COMPOSER DEPENDENCIES

scripts/restore

@@ -71,16 +71,6 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
 
-#=================================================
-# RESTORE THE PHP-FPM CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring the PHP-FPM configuration..."
-
-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 --package="$extra_php_dependencies"
-
 #=================================================
 # SPECIFIC RESTORATION
 #=================================================
@@ -91,6 +81,16 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=2
 # Define and install dependencies
 ynh_install_app_dependencies $pkg_dependencies
 
+#=================================================
+# RESTORE THE PHP-FPM CONFIGURATION
+#=================================================
+ynh_script_progression --message="Restoring the PHP-FPM configuration..."
+
+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 MYSQL DATABASE
 #=================================================
@@ -105,7 +105,9 @@ ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./
 #=================================================
 ynh_script_progression --message="Adding swap..."
 
-ynh_add_swap --size=$swap_needed
+if [ ${PACKAGE_CHECK_EXEC:-0} -eq 0 ]; then
+  ynh_add_swap --size=$swap_needed
+fi
 
 #=================================================
 # RESTORE THE LOGROTATE CONFIGURATION

scripts/upgrade

@@ -158,7 +158,7 @@ ynh_install_app_dependencies $pkg_dependencies
 ynh_script_progression --message="Upgrading php-fpm configuration..." --weight=1
 
 # Create a dedicated php-fpm config
-ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies"
+ynh_add_fpm_config --usage=low --footprint=low
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
@@ -168,7 +168,9 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 #=================================================
 ynh_script_progression --message="Adding swap..."
 
-ynh_add_swap --size=$swap_needed
+if [ ${PACKAGE_CHECK_EXEC:-0} -eq 0 ]; then
+  ynh_add_swap --size=$swap_needed
+fi
 
 #=================================================
 # COMPOSER AND FLARUM UPGRADE