Merge pull request #39 from YunoHost-Apps/testing

4.0.1

README.md

@@ -14,7 +14,7 @@ SPIP is a publishing system for the Internet in which great importance is attach
 
 Source: [spip.net](http://www.spip.net/en_rubrique25.html)
 
-**Shipped version:** 4.0.0
+**Shipped version:** 4.0.1
 
 ## Screenshots
 

README_fr.md

@@ -14,7 +14,7 @@ SPIP est un système de publication pour l’Internet qui s’attache particuli
 
 Source: [spip.net](http://www.spip.net/fr_rubrique91.html)
 
-**Version incluse:** 4.0.0
+**Version incluse:** 4.0.1
 
 ## Captures d'écran
 

check_process

@@ -1,10 +1,10 @@
 ;; Test complet
 	; Manifest
-		domain="domain.tld"	(DOMAIN)
+		domain="domain.tld"
-		path="/path"	(PATH)
+		path="/path"
-		admin="john"	(USER)
+		admin="john"
 		users_status="Editor"
-		is_public=1	(PUBLIC|public=1|private=0)
+		is_public=1
 		password="thisisapassword"
 	; Checks
 		pkg_linter=1

conf/app.src

@@ -1,7 +1,6 @@
-SOURCE_URL=https://files.spip.net/spip/archives/spip-v4.0.0.zip
+SOURCE_URL=https://files.spip.net/spip/archives/spip-v4.0.1.zip
-SOURCE_SUM=d17513fcdac32c07b327ad18032facfcadd174719fba2d4598f10b1c931b7e5a
+SOURCE_SUM=509881b6d8ec23de23ce69f3026610713e756a6d03ceecc7793e864394a8e705
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=
 SOURCE_EXTRACT=true

conf/nginx.conf

@@ -4,11 +4,6 @@ location __PATH__/ {
   # Path to source
   alias __FINALPATH__/ ;
 
-  # Force usage of https
-  if ($scheme = http) {
-    rewrite ^ https://$server_name$request_uri? permanent;
-  }
-
   index index.php;
 
   client_max_body_size 30M;

manifest.json

@@ -6,7 +6,7 @@
         "en": "CMS with a focus on collaborative edition and multilingualism",
         "fr": "CMS conçu pour l'édition collaborative et le multilinguisme"
     },
-    "version": "4.0.0~ynh2",
+    "version": "4.0.1~ynh1",
     "url": "http://www.spip.net/",
     "license": "GPL-3.0-or-later",
     "maintainer": {
@@ -14,7 +14,7 @@
         "email": "cyp@rouquin.me"
     },
     "requirements": {
-        "yunohost": ">= 4.2.7"
+        "yunohost": ">= 4.3.2"
     },
     "multi_instance": true,
     "services": [
@@ -25,8 +25,7 @@
         "install" : [
             {
                 "name": "domain",
-                "type": "domain",
+                "type": "domain"
-                "example": "example.com"
             },
             {
                 "name": "path",
@@ -36,13 +35,11 @@
             },
             {
                 "name": "admin",
-                "type": "user",
+                "type": "user"
-                "example": "johndoe"
             },
             {
                 "name": "password",
-                "type": "password",
+                "type": "password"
-                "example": "Choose a password"
             },
             {
                 "name": "is_public",

scripts/_common.sh

@@ -6,7 +6,7 @@
 
 YNH_PHP_VERSION="7.3"
 
-extra_php_dependencies="php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-gd"
+pkg_dependencies="php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-gd"
 
 #=================================================
 # EXPERIMENTAL HELPERS

scripts/install

@@ -54,6 +54,13 @@ ynh_app_setting_set --app=$app --key=admin --value=$admin
 ynh_app_setting_set --app=$app --key=password --value=$password
 ynh_app_setting_set --app=$app --key=users_status --value=$users_status
 
+#=================================================
+# INSTALL DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Installing dependencies..."
+
+ynh_install_app_dependencies $pkg_dependencies
+
 #=================================================
 # CREATE DEDICATED USER
 #=================================================
@@ -100,7 +107,7 @@ ynh_add_nginx_config
 ynh_script_progression --message="Configuring PHP-FPM..."
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --package="$extra_php_dependencies"
+ynh_add_fpm_config
 
 #=================================================
 # SPECIFIC SETUP
@@ -115,8 +122,6 @@ chown -R $app:www-data "$final_path"
 
 # Set the app as temporarily public for curl call
 ynh_script_progression --message="Configuring SSOwat..."
-# Making the app public for curl
-ynh_permission_update --permission="main" --add="visitors"
 
 # Installation with curl
 ynh_script_progression --message="Finalizing installation..."
@@ -147,9 +152,6 @@ email=$(yunohost user info $admin | grep mail: | cut -d' ' -f2 | tr -d '\n')
 ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=3b" "adresse_db=localhost" "login_db=$db_name" "pass_db=$db_pwd" "server_db=mysql" "sel_db=$db_name" "nom=$admin" "email=$email" "login=$admin" "pass=$password" "pass_verif=$password"
 ynh_local_curl "/ecrire/?suivant" "exec=install" "etape=fin"
 
-# Remove the public access
-ynh_permission_update --permission="main" --remove="visitors"
-
 #=================================================
 # MODIFY A CONFIG FILE
 #=================================================

scripts/remove

@@ -39,6 +39,14 @@ ynh_script_progression --message="Removing the MySQL database..."
 # Remove a database if it exists, along with the associated user
 ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name
 
+#=================================================
+# REMOVE DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Removing dependencies..."
+
+# Remove metapackage and its dependencies
+ynh_remove_app_dependencies
+
 #=================================================
 # REMOVE APP MAIN DIR
 #=================================================

scripts/restore

@@ -39,10 +39,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..."
 
-ynh_webpath_available --domain=$domain --path_url=$path_url \
+test ! -d $final_path || ynh_die --message="There is already a directory: $final_path "
-	|| ynh_die --message="Path not available: ${domain}${path_url}"
-test ! -d $final_path \
-	|| ynh_die --message="There is already a directory: $final_path "
 
 #=================================================
 # STANDARD RESTORATION STEPS
@@ -81,8 +78,15 @@ 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 --phpversion=$phpversion --package="$extra_php_dependencies"
+ynh_add_fpm_config --phpversion=$phpversion
 
+#=================================================
+# REINSTALL DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Reinstalling dependencies..."
+
+# Define and install dependencies
+ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # SPECIFIC RESTORATION

scripts/upgrade

@@ -59,9 +59,8 @@ ynh_abort_if_errors
 #=================================================
 ynh_script_progression --message="Ensuring downward compatibility..."
 
-is_public=$(ynh_app_setting_get --app=$app --key=is_public)
 # Remove is_public
-if [ -n "$is_public" ]; then
+if [ -n "$(ynh_app_setting_get --app=$app --key=is_public)" ]; then
 	ynh_app_setting_delete --app=$app --key=is_public
 fi
 
@@ -145,13 +144,20 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..."
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
+#=================================================
+# UPGRADE DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Upgrading dependencies..."
+
+ynh_install_app_dependencies $pkg_dependencies
+
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
 ynh_script_progression --message="Upgrading PHP-FPM configuration..."
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --package="$extra_php_dependencies"
+ynh_add_fpm_config
 
 #=================================================
 # SPECIFIC UPGRADE
@@ -167,15 +173,6 @@ chown -R $app:www-data "$final_path"
 # Set the app as temporarily public for curl call
 ynh_script_progression --message="Configuring SSOwat..."
 
-
-if ! ynh_permission_has_user --permission=main --user="visitors"; then
-	is_public=0
-	# Making the app public for curl
-	ynh_permission_update --permission="main" --add="visitors"
-else
-	is_public=1
-fi
-
 ynh_backup_if_checksum_is_different --file="$final_path/config/connect.php"
 
 mv $final_path/config/connect.php $final_path/config/connect.php.ynh_bkp
@@ -230,17 +227,6 @@ ynh_store_file_checksum --file="$final_path/config/connect.php"
 
 #=================================================
 # GENERIC FINALIZATION
-#=================================================
-# SETUP SSOWAT
-#=================================================
-ynh_script_progression --message="Configuring permissions..."
-
-# Make app private if necessary
-if [ $is_public -eq 0 ]
-then
-	ynh_permission_update --permission="main" --remove="visitors"
-fi
-
 #=================================================
 # RELOAD NGINX
 #=================================================