diff --git a/conf/app.src b/conf/app.src index 034c371..3de7349 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,5 @@ -SOURCE_URL=https://github.com/movim/movim/archive/refs/tags/v0.19.1rc5.tar.gz -SOURCE_SUM=48240577116edf6df6da1daceee78c2a50037f86a1a9349071cc18390dd82b8c +SOURCE_URL=https://github.com/movim/movim/archive/refs/tags/v0.20rc1.tar.gz +SOURCE_SUM=504e456888eb18ce2474ab8cd3fcd261a95e5ba83fcc189bbc95709fa88e644d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= \ No newline at end of file +SOURCE_IN_SUBDIR=true \ No newline at end of file diff --git a/manifest.json b/manifest.json index db0dbe4..a6b794e 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Web-based cross-platform XMPP client", "fr": "Client XMPP multiplateforme basé sur le Web" }, - "version": "0.19.1~ynh1", + "version": "0.20.0~ynh1", "url": "https://movim.eu", "upstream": { "license": "AGPL-3.0-or-later", diff --git a/scripts/_common.sh b/scripts/_common.sh index 986295d..13bd38c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,13 +5,11 @@ #================================================= # dependencies used by the app -pkg_dependencies="postgresql postgresql-contrib apt-transport-https" - YNH_PHP_VERSION="7.3" YNH_COMPOSER_VERSION="2.0.13" -extra_php_dependencies="php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-xml" +pkg_dependencies="postgresql postgresql-contrib apt-transport-https php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-xml" #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index d97ac61..1715ee1 100644 --- a/scripts/install +++ b/scripts/install @@ -119,7 +119,7 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 # Create a dedicated PHP-FPM config ynh_replace_string --match_string="__TIMEZONE__" --replace_string="$timezone" --target_file=../conf/php-fpm.conf -ynh_add_fpm_config --package="$extra_php_dependencies" +ynh_add_fpm_config phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion) #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 33de1a1..b954ff0 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -126,7 +126,7 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config ynh_replace_string --match_string="__TIMEZONE__" --replace_string="$timezone" --target_file=../conf/php-fpm.conf -ynh_add_fpm_config --package="$extra_php_dependencies" +ynh_add_fpm_config #================================================= # INTEGRATE SERVICE IN YUNOHOST