diff --git a/README.md b/README.md index 5370751..4a56275 100644 --- a/README.md +++ b/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 diff --git a/README_es.md b/README_es.md index 4312fd2..171b958 100644 --- a/README_es.md +++ b/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 diff --git a/README_eu.md b/README_eu.md index 194a3f4..14960b6 100644 --- a/README_eu.md +++ b/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 diff --git a/README_fr.md b/README_fr.md index 4f010d7..60ca70b 100644 --- a/README_fr.md +++ b/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 diff --git a/README_gl.md b/README_gl.md index f1d486a..8f7ed5a 100644 --- a/README_gl.md +++ b/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 diff --git a/README_id.md b/README_id.md index 8fc1a65..5547774 100644 --- a/README_id.md +++ b/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 diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 20e90d8..ddb4535 100644 --- a/README_zh_Hans.md +++ b/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 ## 截图 diff --git a/manifest.toml b/manifest.toml index dd5746a..a77ebaf 100644 --- a/manifest.toml +++ b/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" diff --git a/scripts/backup b/scripts/backup index a79e87e..b89e87d 100644 --- a/scripts/backup +++ b/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 #================================================= diff --git a/scripts/remove b/scripts/remove index 15cd040..da3d304 100644 --- a/scripts/remove +++ b/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 #================================================= diff --git a/scripts/restore b/scripts/restore index c8080d8..5a0b820 100644 --- a/scripts/restore +++ b/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 #=================================================