Merge pull request #59 from YunoHost-Apps/upgrade

Upgrade

.github/workflows/update_extensions.py

@@ -36,8 +36,9 @@ def generate_ext_source(asset_url: str, src_filename: str) -> None:
             SOURCE_URL={asset_url}
             SOURCE_SUM={sha256sum_of_url(asset_url)}
             SOURCE_SUM_PRG=sha256sum
-            SOURCE_FORMAT=.tar.gz
+            SOURCE_FORMAT=tar.gz
-            SOURCE_IN_SUBDIR=true
+            SOURCE_IN_SUBDIR=false
+            SOURCE_FILENAME=
             SOURCE_EXTRACT=true
         """))
 

check_process

@@ -5,7 +5,7 @@
 		is_public=1
 		language="fr"
 		admin="john"
-		password="jztI4OHHr2RfhrqK5wgX"
+		password="1Strong-Password"
 		wiki_name="MyYunoWiki"
 	; Checks
 		pkg_linter=1

conf/app.src

@@ -3,4 +3,5 @@ SOURCE_SUM=583f074bcafcec17da50142a56f5bbfde5c3366977d61d912d7e56fcca3bda1b
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
+SOURCE_FILENAME=
 SOURCE_EXTRACT=true

conf/ldap_authentication2.src

@@ -1,6 +1,7 @@
-SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/LDAPAuthentication2-REL1_35-03fba4b.tar.gz
+SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/LDAPAuthentication2-REL1_38-502759b.tar.gz
-SOURCE_SUM=bbda25c02d85c31bef158b03958edfa3e46831ef53672f8cc8c24c6adda6d244
+SOURCE_SUM=2212a2baa6b070d08fe36b8f3cf236a76a7aa58cdc5953c65a9a66d16cee3dc6
 SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=.tar.gz
+SOURCE_FORMAT=tar.gz
-SOURCE_IN_SUBDIR=true
+SOURCE_IN_SUBDIR=false
+SOURCE_FILENAME=
 SOURCE_EXTRACT=true

conf/ldap_authorization.src

@@ -1,6 +1,7 @@
 SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/LDAPAuthorization-REL1_37-ba9cdb5.tar.gz
 SOURCE_SUM=b5134407376f33e0c43c7c85fb965757a6ffd83d13280ff26e84d1ced4747bb8
 SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=.tar.gz
+SOURCE_FORMAT=tar.gz
-SOURCE_IN_SUBDIR=true
+SOURCE_IN_SUBDIR=false
+SOURCE_FILENAME=
 SOURCE_EXTRACT=true

conf/ldap_groups.src

@@ -1,6 +1,7 @@
 SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/LDAPGroups-REL1_37-ad40602.tar.gz
 SOURCE_SUM=d98161ae03319bfd92c140210224c3da5fb42c015d2c606eaa64692f69a00dec
 SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=.tar.gz
+SOURCE_FORMAT=tar.gz
-SOURCE_IN_SUBDIR=true
+SOURCE_IN_SUBDIR=false
+SOURCE_FILENAME=
 SOURCE_EXTRACT=true

conf/ldap_provider.src

@@ -1,6 +1,7 @@
 SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/LDAPProvider-REL1_35-1300b26.tar.gz
 SOURCE_SUM=6c42b82a4d7753c280731c8f8bda5640cfb2822a6e130e30c95d58476ab7725f
 SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=.tar.gz
+SOURCE_FORMAT=tar.gz
-SOURCE_IN_SUBDIR=true
+SOURCE_IN_SUBDIR=false
+SOURCE_FILENAME=
 SOURCE_EXTRACT=true

conf/ldap_userinfo.src

@@ -1,6 +1,7 @@
 SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/LDAPUserInfo-REL1_37-255e2b9.tar.gz
 SOURCE_SUM=3751415aa48d1d552c185ce884a3a7ed5745a3baf91c72aa7820b8f89fd548a4
 SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=.tar.gz
+SOURCE_FORMAT=tar.gz
-SOURCE_IN_SUBDIR=true
+SOURCE_IN_SUBDIR=false
+SOURCE_FILENAME=
 SOURCE_EXTRACT=true

conf/nginx.conf

@@ -5,10 +5,13 @@
 location __PATH__/ {
 
   # Path to source
-  alias __FINALPATH__/ ;
+  alias __FINALPATH__/;
 
   index index.php;
 
+  # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file
+  #client_max_body_size 50M;
+
   try_files $uri $uri/ @rewrite___NAME__;
   location ~ [^/]\.php(/|$) {
     fastcgi_split_path_info ^(.+?\.php)(/.*)$;

conf/pluggable_auth.src

@@ -1,6 +1,7 @@
 SOURCE_URL=https://extdist.wmflabs.org/dist/extensions/PluggableAuth-REL1_37-a932c78.tar.gz
 SOURCE_SUM=fbfce41876ff07be8d69a29b8b35054a68543d2cc91aa0280e73793d42c6e48e
 SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=.tar.gz
+SOURCE_FORMAT=tar.gz
-SOURCE_IN_SUBDIR=true
+SOURCE_IN_SUBDIR=false
+SOURCE_FILENAME=
 SOURCE_EXTRACT=true

scripts/_common.sh

@@ -7,8 +7,6 @@
 # dependencies used by the app
 pkg_dependencies="diffutils imagemagick acl"
 
-YNH_PHP_VERSION="7.3"
-
 #=================================================
 # PERSONAL HELPERS
 #=================================================

scripts/install

@@ -104,14 +104,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..." --weight=1
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
-
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
@@ -121,6 +113,14 @@ ynh_script_progression --message="Configuring PHP-FPM..." --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="Configuring NGINX web server..." --weight=1
+
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
 #=================================================
 # SPECIFIC SETUP
 #=================================================

scripts/restore

@@ -30,7 +30,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
-
 fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint)
 fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage)
 
@@ -44,13 +43,6 @@ test ! -d $final_path \
 
 #=================================================
 # STANDARD RESTORATION STEPS
-#=================================================
-# RESTORE THE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring the NGINX web server configuration..."
-
-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-
 #=================================================
 # RECREATE THE DEDICATED USER
 #=================================================
@@ -70,6 +62,16 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
 
+#=================================================
+# SPECIFIC RESTORATION
+#=================================================
+# REINSTALL DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Reinstalling dependencies..." --weight=10
+
+# Define and install dependencies
+ynh_install_app_dependencies $pkg_dependencies
+
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION
 #=================================================
@@ -81,14 +83,11 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$phpversion
 
 #=================================================
-# SPECIFIC RESTORATION
+# RESTORE THE NGINX CONFIGURATION
 #=================================================
-# REINSTALL DEPENDENCIES
+ynh_script_progression --message="Restoring the NGINX web server configuration..."
-#=================================================
-ynh_script_progression --message="Reinstalling dependencies..." --weight=10
 
-# Define and install dependencies
+ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # RESTORE THE MYSQL DATABASE

scripts/upgrade

@@ -27,7 +27,6 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
 wiki_name=$(ynh_app_setting_get --app=$app --key=wiki_name)
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 secret=$(ynh_app_setting_get --app=$app --key=secret)
-
 fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint)
 fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage)
 
@@ -59,6 +58,13 @@ ynh_abort_if_errors
 #=================================================
 ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
 
+# Cleaning legacy permissions
+if ynh_legacy_permissions_exists; then
+	ynh_legacy_permissions_delete_all
+
+	ynh_app_setting_delete --app=$app --key=is_public
+fi
+
 # If db_name doesn't exist, create it
 if [ -z "$db_name" ]; then
 	db_name=$(ynh_sanitize_dbid --db_name=$app)
@@ -91,13 +97,6 @@ if [[ -n "$ldap_user" ]]; then
 	ynh_app_setting_delete --app=$app --key=ldap_password
 fi
 
-# Cleaning legacy permissions
-if ynh_legacy_permissions_exists; then
-	ynh_legacy_permissions_delete_all
-
-	ynh_app_setting_delete --app=$app --key=is_public
-fi
-
 #=================================================
 # CREATE DEDICATED USER
 #=================================================
@@ -131,14 +130,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
 #=================================================
@@ -155,19 +146,19 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1
 ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint
 
 #=================================================
-# SPECIFIC UPGRADE
+# NGINX CONFIGURATION
 #=================================================
-# REMOVE LEGACY LDAP USER
+ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
-#=================================================
+
-#=================================================
+# Create a dedicated NGINX config
-# STORE THE CONFIG FILE CHECKSUM
+ynh_add_nginx_config
-#=================================================
-ynh_backup_if_checksum_is_different --file="$final_path/LocalSettings.php"
 
 #=================================================
-# REPLACE CONFIGURATION SETTINGS
+# SPECIFIC UPGRADE
 #=================================================
-ynh_script_progression --message="Upgrading application files..." --weight=4
+# UPDATE A CONFIG FILE
+#=================================================
+ynh_script_progression --message="Updating a configuration file..." --weight=4
 
 if [ "$path_url" = "/" ]; then
 	# MediaWiki expects a "" for the root URL which is typically assumed to be