From f4864e7baf1a40707cab3bfb725af0f9d1dd8bbd Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 19 Jan 2021 08:47:56 +0100 Subject: [PATCH 1/2] Upgrade to 4.2.6 --- README.md | 2 +- conf/app.src | 4 ++-- manifest.json | 4 ++-- scripts/_common.sh | 2 +- scripts/change_url | 6 +++--- scripts/install | 12 ++++++------ scripts/remove | 4 ++-- scripts/restore | 4 ++-- scripts/upgrade | 12 ++++++------ 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index a196dbd..ff16fd5 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview [Ampache](http://ampache.org) for the love of music. A web based audio/video streaming application and file manager allowing you to access your music & videos from anywhere, using almost any internet enabled device. -**Shipped version:** 4.2.5 +**Shipped version:** 4.2.6 ## Screenshots diff --git a/conf/app.src b/conf/app.src index 041c788..49c4f7d 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ampache/ampache/archive/4.2.5.tar.gz -SOURCE_SUM=8cc954c997a5df722699ff165f20f06ceb095481bb20cccede0f585880d4c536 +SOURCE_URL=https://github.com/ampache/ampache/archive/4.2.6.tar.gz +SOURCE_SUM=7cba92f9e59b2c8c81ddfa3d82ca77761d3b0d3c55c6372db01410e5c22ddb46 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index c1f7116..4548386 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Web based audio/video streaming application", "fr": "Application de streaming audio et vidéo" }, - "version": "4.2.5~ynh1", + "version": "4.2.6~ynh1", "url": "http://ampache.org", "license": "AGPL-3.0", "maintainer": { @@ -19,7 +19,7 @@ "multi_instance": true, "services" : [ "nginx", - "php7.0-fpm", + "php7.3-fpm", "mysql" ], "arguments": { diff --git a/scripts/_common.sh b/scripts/_common.sh index 981bf56..70aac76 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -15,7 +15,7 @@ extra_php_dependencies="php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-curl p # EXPERIMENTAL HELPERS #================================================= -readonly YNH_DEFAULT_COMPOSER_VERSION=1.10.17 +readonly YNH_DEFAULT_COMPOSER_VERSION=2.0.8 # Declare the actual composer version to use. # A packager willing to use another version of composer can override the variable into its _common.sh. YNH_COMPOSER_VERSION=${YNH_COMPOSER_VERSION:-$YNH_DEFAULT_COMPOSER_VERSION} diff --git a/scripts/change_url b/scripts/change_url index 857edfe..64103c0 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -50,7 +50,7 @@ fi #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating nginx web server configuration..." --weight=2 +ynh_script_progression --message="Updating NGINX web server configuration..." --weight=2 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf @@ -81,7 +81,7 @@ fi #================================================= # CHANGE AMPACHE CONFIGURATION #================================================= -ynh_script_progression --message="Updating ampache configuration..." +ynh_script_progression --message="Updating Ampache configuration..." conf_file="$final_path/config/ampache.cfg.php" @@ -93,7 +93,7 @@ ynh_replace_string --match_string="\(http_host.*=.*\)\"$old_domain\"" --replace_ #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." +ynh_script_progression --message="Reloading NGINX web server..." ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/install b/scripts/install index 6d1613b..7adfc75 100644 --- a/scripts/install +++ b/scripts/install @@ -79,7 +79,7 @@ ynh_setup_source --dest_dir="$final_path" #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring nginx web server..." +ynh_script_progression --message="Configuring NGINX web server..." # Create a dedicated nginx config ynh_add_nginx_config @@ -95,7 +95,7 @@ ynh_system_user_create --username=$app #================================================= # PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Configuring php-fpm..." +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" @@ -105,7 +105,7 @@ ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencie #================================================= # CONFIGURE AMPACHE #================================================= -ynh_script_progression --message="Preconfiguring ampache..." --weight=2 +ynh_script_progression --message="Preconfiguring Ampache..." --weight=2 conf_file="$final_path/config/ampache.cfg.php" cp ../conf/ampache.cfg.php "$conf_file" @@ -133,7 +133,7 @@ ynh_mysql_connect_as --user=$app --password="$db_pwd" --database=$app < "$final_ #================================================= # INSTALL AMPACHE WITH COMPOSER #================================================= -ynh_script_progression --message="Installing ampache with composer..." --weight=45 +ynh_script_progression --message="Installing ampache with Composer..." --weight=45 # Install composer ynh_install_composer --phpversion="${YNH_PHP_VERSION}" --workdir="$final_path" --install_args="--prefer-source --no-dev" @@ -148,7 +148,7 @@ ynh_multimedia_build_main_dir #================================================= # PRE CONFIGURE AMPACHE #================================================= -ynh_script_progression --message="Configuring ampache..." --weight=5 +ynh_script_progression --message="Configuring Ampache..." --weight=5 # Set the app as temporarily public for curl call ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" @@ -197,7 +197,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." +ynh_script_progression --message="Reloading NGINX web server..." ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/remove b/scripts/remove index 7fd7240..f2a5098 100644 --- a/scripts/remove +++ b/scripts/remove @@ -50,7 +50,7 @@ ynh_secure_remove --file="$final_path" #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing nginx web server configuration..." +ynh_script_progression --message="Removing NGINX web server configuration..." # Remove the dedicated nginx config ynh_remove_nginx_config @@ -58,7 +58,7 @@ ynh_remove_nginx_config #================================================= # REMOVE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Removing php-fpm configuration..." +ynh_script_progression --message="Removing PHP-FPM configuration..." # Remove the dedicated php-fpm config ynh_remove_fpm_config diff --git a/scripts/restore b/scripts/restore index 79e40e7..db47654 100644 --- a/scripts/restore +++ b/scripts/restore @@ -44,7 +44,7 @@ test ! -d $final_path \ #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the nginx configuration..." +ynh_script_progression --message="Restoring the NGINX configuration..." ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" @@ -105,7 +105,7 @@ ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./ #================================================= # RELOAD NGINX AND PHP-FPM #================================================= -ynh_script_progression --message="Reloading nginx web server and php-fpm..." +ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." ynh_systemd_action --service_name=php${YNH_PHP_VERSION}-fpm --action=reload ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index 09e49b2..c7fb14c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -102,7 +102,7 @@ fi #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading nginx web server configuration..." --weight=3 +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=3 # Create a dedicated nginx config ynh_add_nginx_config @@ -125,7 +125,7 @@ ynh_system_user_create --username=$app #================================================= # PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading php-fpm configuration..." --weight=2 +ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 # Create a dedicated php-fpm config ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies" @@ -138,7 +138,7 @@ ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencie if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Upgrading ampache configuration..." + ynh_script_progression --message="Upgrading Ampache configuration..." conf_file="$final_path/config/ampache.cfg.php" ynh_backup_if_checksum_is_different --file="$conf_file" @@ -157,7 +157,7 @@ then #================================================= # UPDATE AMPACHE WITH COMPOSER #================================================= - ynh_script_progression --message="Upgrading ampache with composer..." --weight=30 + ynh_script_progression --message="Upgrading ampache with Composer..." --weight=30 # Install composer ynh_install_composer --phpversion="${YNH_PHP_VERSION}" --workdir="$final_path" --install_args="--prefer-source --no-dev" @@ -177,7 +177,7 @@ ynh_multimedia_build_main_dir if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Upgrading ampache with curl..." --weight=6 + ynh_script_progression --message="Upgrading Ampache with cURL..." --weight=6 # Set the app as temporarily public for curl call ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" @@ -215,7 +215,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." +ynh_script_progression --message="Reloading NGINX web server..." ynh_systemd_action --service_name=nginx --action=reload From aa71fa3a3d116b97c6c5254d31bedb82f9fbb4c1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 19 Jan 2021 08:52:53 +0100 Subject: [PATCH 2/2] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 70aac76..981bf56 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -15,7 +15,7 @@ extra_php_dependencies="php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-curl p # EXPERIMENTAL HELPERS #================================================= -readonly YNH_DEFAULT_COMPOSER_VERSION=2.0.8 +readonly YNH_DEFAULT_COMPOSER_VERSION=1.10.17 # Declare the actual composer version to use. # A packager willing to use another version of composer can override the variable into its _common.sh. YNH_COMPOSER_VERSION=${YNH_COMPOSER_VERSION:-$YNH_DEFAULT_COMPOSER_VERSION}