Merge remote-tracking branch 'upstream/testing' into enable_ldap

README.md

@@ -30,7 +30,7 @@ COIN is an Information System designed for associative ISPs in the FFDN.
 - Optional features: mailing list, hardware provisionning
 
 
-**Shipped version:** 20231216~ynh1
+**Shipped version:** 20231216~ynh2
 
 ## Screenshots
 

README_es.md

@@ -30,7 +30,7 @@ COIN is an Information System designed for associative ISPs in the FFDN.
 - Optional features: mailing list, hardware provisionning
 
 
-**Versión actual:** 20231216~ynh1
+**Versión actual:** 20231216~ynh2
 
 ## Capturas
 

README_eu.md

@@ -30,7 +30,7 @@ COIN is an Information System designed for associative ISPs in the FFDN.
 - Optional features: mailing list, hardware provisionning
 
 
-**Paketatutako bertsioa:** 20231216~ynh1
+**Paketatutako bertsioa:** 20231216~ynh2
 
 ## Pantaila-argazkiak
 

README_fr.md

@@ -30,7 +30,7 @@ COIN est un système d'information pour FAI associatif dans la FFDN
 - Optionnel : gestion de mailing liste, prêt de matériel
 
 
-**Version incluse :** 20231216~ynh1
+**Version incluse :** 20231216~ynh2
 
 ## Captures d’écran
 

README_gl.md

@@ -30,7 +30,7 @@ COIN is an Information System designed for associative ISPs in the FFDN.
 - Optional features: mailing list, hardware provisionning
 
 
-**Versión proporcionada:** 20231216~ynh1
+**Versión proporcionada:** 20231216~ynh2
 
 ## Capturas de pantalla
 

README_id.md

@@ -30,7 +30,7 @@ COIN is an Information System designed for associative ISPs in the FFDN.
 - Optional features: mailing list, hardware provisionning
 
 
-**Versi terkirim:** 20231216~ynh1
+**Versi terkirim:** 20231216~ynh2
 
 ## Tangkapan Layar
 

README_zh_Hans.md

@@ -30,7 +30,7 @@ COIN is an Information System designed for associative ISPs in the FFDN.
 - Optional features: mailing list, hardware provisionning
 
 
-**分发版本：** 20231216~ynh1
+**分发版本：** 20231216~ynh2
 
 ## 截图
 

manifest.toml

@@ -7,7 +7,7 @@ name = "Coin"
 description.en = "Member dashboard for non profit isp."
 description.fr = "Coin est un Outil pour un Internet Neutre."
 
-version = "20231216~ynh1"
+version = "20231216~ynh2"
 
 maintainers = ["ljf", "aleks"]
 
@@ -17,7 +17,7 @@ website = "https://code.ffdn.org/FFDN/coin"
 code = "https://code.ffdn.org/ffdn/coin"
 
 [integration]
-yunohost = ">= 11.2.13"
+yunohost = ">= 11.2.20"
 architectures = "all"
 multi_instance = false
 ldap = false
@@ -28,9 +28,11 @@ ram.runtime = "50M"
 
 [install]
     [install.domain]
-    # this is a generic question - ask strings are automatically handled by Yunohost's core
     type = "domain"
 
+    [install.admin]
+    type = "user"
+
     [install.email]
     ask.en = "Choose email were send notification"
     ask.fr = "Choisissez l'email vers lequel envoyer les notifications"

scripts/backup

@@ -9,11 +9,24 @@ source /usr/share/yunohost/helpers
 #=================================================
 ynh_print_info --message="Declaring files to be backed up..."
 
+#=================================================
+# BACKUP THE APP MAIN DIR
+#=================================================
+
 ynh_backup --src_path="$install_dir"
+
+#=================================================
+# SYSTEM CONFIGURATION
+#=================================================
+
 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 ynh_backup --src_path="/etc/systemd/system/$app.service"
 
+#=================================================
+# BACKUP THE DATABASE
+#=================================================
 ynh_print_info --message="Backing up the PostgreSQL database..."
+
 ynh_psql_dump_db --database="$db_name" > db.sql
 
 #=================================================

scripts/remove

@@ -3,7 +3,10 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-ynh_script_progression --message="Removing system configurations..." --weight=1
+#=================================================
+# REMOVE SYSTEM CONFIGURATIONS
+#=================================================
+ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
 
 # Remove the service from the list of services known by YunoHost (added from `yunohost service add`)
 if ynh_exec_warn_less yunohost service status $app >/dev/null
@@ -17,8 +20,6 @@ ynh_remove_systemd_config
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
-# Remove the log files
-
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/restore

@@ -56,19 +56,12 @@ systemctl enable $app.service --quiet
 yunohost service add $app --description "$app daemon" --log="/var/log/$app/$app.log"
 
 #=================================================
-# START SYSTEMD SERVICE
+# RELOAD NGINX AND PHP-FPM OR THE APP SERVICE
 #=================================================
-ynh_script_progression --message="Starting a systemd service..." --weight=1
+ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1
 
 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# RELOAD NGINX
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=1
-
 ynh_systemd_action --service_name=nginx --action=reload
 
 #=================================================