Feat bump to v4.1.1

conf/app.src

@@ -1,6 +1,6 @@
-SOURCE_URL=https://github.com/ampache/ampache/archive/3.9.0.tar.gz
-SOURCE_SUM=1e523b52c6402693102dac183d7597d6e0aebf63580167f45661d0f15f57c072
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=tar.gz
-SOURCE_IN_SUBDIR=true
+SOURCE_URL=https://github.com/ampache/ampache/releases/download/4.1.1/ampache-4.1.1_all.zip
+SOURCE_SUM=eb958442fcc0c6377f9070baa7db13b4
+SOURCE_SUM_PRG=md5sum
+SOURCE_FORMAT=zip
+SOURCE_IN_SUBDIR=false
 SOURCE_FILENAME=

conf/nginx.conf

@@ -17,7 +17,7 @@ location __PATH__/ {
 	try_files $uri $uri/ index.php;
 	location ~ [^/]\.php(/|$) {
 		fastcgi_split_path_info ^(.+?\.php)(/.*)$;
-		fastcgi_pass unix:/var/run/php/php7.0-fpm-__NAME__.sock;
+		fastcgi_pass unix:/var/run/php/php__YNH_PHP_VERSION__-fpm-__NAME__.sock;
 		fastcgi_index index.php;
 		include fastcgi_params;
 		fastcgi_param REMOTE_USER $remote_user;

manifest.json

@@ -6,7 +6,7 @@
         "en": "A web based audio/video streaming application",
         "fr": "Une application de streaming audio et vidéo"
     },
-    "version": "3.9.0~ynh2",
+    "version": "4.1.1~ynh",
     "url": "http://ampache.org",
     "license": "AGPL-3.0",
     "maintainer": {
@@ -15,11 +15,11 @@
     },
     "multi_instance": true,
     "requirements": {
-        "yunohost": ">= 3.5.0"
+        "yunohost": ">= 3.8.0"
     },
     "services" : [
         "nginx",
-        "php7.0-fpm",
+        "php7.3-fpm",
         "mysql"
     ],
     "arguments": {

scripts/_common.sh

@@ -1,4 +1,11 @@
 #!/bin/bash
+#=================================================
+# COMMON VARIABLES
+#=================================================
+
+pkg_dependencies="libav-tools"
+YNH_PHP_VERSION="7.3"
+extra_php_dependencies="php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-ldap"
 
 #=================================================
 # EXPERIMENTAL HELPERS

scripts/install

@@ -55,7 +55,7 @@ ynh_app_setting_set --app=$app --key=is_public --value=$is_public
 #=================================================
 ynh_script_progression --message="Installing dependencies..." --weight=25
 
-ynh_install_app_dependencies libav-tools php-cli
+ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # CREATE A MYSQL DATABASE
@@ -81,7 +81,7 @@ ynh_setup_source --dest_dir="$final_path"
 ynh_script_progression --message="Configuring nginx web server..."
 
 # Create a dedicated nginx config
-ynh_add_nginx_config
+ynh_add_nginx_config YNH_PHP_VERSION
 
 #=================================================
 # CREATE DEDICATED USER
@@ -97,7 +97,7 @@ ynh_system_user_create --username=$app
 ynh_script_progression --message="Configuring php-fpm..."
 
 # Create a dedicated php-fpm config
-ynh_add_fpm_config
+ynh_add_fpm_config --usage=low --footprint=low --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies"
 
 #=================================================
 # SPECIFIC SETUP
@@ -128,16 +128,6 @@ ynh_store_file_checksum --file="$conf_file"
 # Load default ampache database
 ynh_mysql_connect_as --user=$app --password="$db_pwd" --database=$app < "$final_path/sql/ampache.sql"
 
-#=================================================
-# INSTALL AMPACHE WITH COMPOSER
-#=================================================
-ynh_script_progression --message="Installing ampache with composer..." --weight=45
-
-# Install composer
-ynh_install_composer
-
-ynh_exec_warn_less ynh_composer_exec --commands=\"install --prefer-source --no-dev\"
-
 #=================================================
 # INSTALL MULTIMEDIA DIRECTORIES
 #=================================================

scripts/upgrade

@@ -22,6 +22,9 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 secret_key=$(ynh_app_setting_get --app=$app --key=secret_key)
 
+fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint)
+fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage)
+
 #=================================================
 # CHECK VERSION
 #=================================================
@@ -68,6 +71,18 @@ fi
 
 ynh_app_setting_delete --app=$app --key=skipped_uris
 
+# If fpm_footprint doesn't exist, create it
+if [ -z "$fpm_footprint" ]; then
+	fpm_footprint=low
+	ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint
+fi
+
+# If fpm_usage doesn't exist, create it
+if [ -z "$fpm_usage" ]; then
+	fpm_usage=low
+	ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage
+fi
+
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================
@@ -106,15 +121,16 @@ fi
 #=================================================
 ynh_script_progression --message="Upgrading nginx web server configuration..." --weight=3
 
-# Create a dedicated nginx config
-ynh_add_nginx_config
+# Re-create a dedicated nginx config
+ynh_remove_nginx_config
+ynh_add_nginx_config YNH_PHP_VERSION
 
 #=================================================
 # UPGRADE DEPENDENCIES
 #=================================================
 ynh_script_progression --message="Upgrading dependencies..." --weight=5
 
-ynh_install_app_dependencies libav-tools php-cli
+ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # CREATE DEDICATED USER
@@ -130,7 +146,7 @@ ynh_system_user_create --username=$app
 ynh_script_progression --message="Upgrading php-fpm configuration..." --weight=2
 
 # Create a dedicated php-fpm config
-ynh_add_fpm_config
+ynh_add_fpm_config --phpversion="$YNH_PHP_VERSION" --usage=$fpm_usage --footprint=$fpm_footprint --package="$extra_php_dependencies"
 
 #=================================================
 # SPECIFIC UPGRADE
@@ -145,6 +161,7 @@ then
     conf_file="$final_path/config/ampache.cfg.php"
     ynh_backup_if_checksum_is_different --file="$conf_file"
 
+    cp ../conf/ampache.cfg.php "$conf_file"
     ynh_replace_string --match_string="__DBUSER__" --replace_string="$db_name" --target_file="$conf_file"
     db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
     ynh_replace_string --match_string="__DBPWD__" --replace_string="$db_pwd" --target_file="$conf_file"
@@ -156,16 +173,6 @@ then
     # Calculate and store the config file checksum into the app settings
     ynh_store_file_checksum --file="$conf_file"
 
-    #=================================================
-    # UPDATE AMPACHE WITH COMPOSER
-    #=================================================
-    ynh_script_progression --message="Upgrading ampache with composer..." --weight=30
-
-    # Install composer
-    ynh_install_composer
-
-    ynh_composer_exec --commands="config discard-changes true"
-    ynh_composer_exec --commands="update --prefer-source --no-interaction --no-dev"
 fi
 
 #=================================================