diff --git a/README.md b/README.md index 02740b6..7d2011d 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ It shall NOT be edited by hand. Create simple online educational pathes -**Shipped version:** 0.5.16~ynh1 +**Shipped version:** 0.5.16~ynh2 **Demo:** ## Documentation and resources diff --git a/README_es.md b/README_es.md index 222c254..58fa4ab 100644 --- a/README_es.md +++ b/README_es.md @@ -18,7 +18,7 @@ No se debe editar a mano. Create simple online educational pathes -**Versión actual:** 0.5.16~ynh1 +**Versión actual:** 0.5.16~ynh2 **Demo:** ## Documentaciones y recursos diff --git a/README_eu.md b/README_eu.md index 4fc4109..3862b54 100644 --- a/README_eu.md +++ b/README_eu.md @@ -18,7 +18,7 @@ EZ editatu eskuz. Create simple online educational pathes -**Paketatutako bertsioa:** 0.5.16~ynh1 +**Paketatutako bertsioa:** 0.5.16~ynh2 **Demoa:** ## Dokumentazioa eta baliabideak diff --git a/README_fr.md b/README_fr.md index 565eeb3..b0fc8a4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main. Create simple online educational pathes -**Version incluse :** 0.5.16~ynh1 +**Version incluse :** 0.5.16~ynh2 **Démo :** ## Documentations et ressources diff --git a/README_gl.md b/README_gl.md index f8dfb66..4fdf8fa 100644 --- a/README_gl.md +++ b/README_gl.md @@ -18,7 +18,7 @@ NON debe editarse manualmente. Create simple online educational pathes -**Versión proporcionada:** 0.5.16~ynh1 +**Versión proporcionada:** 0.5.16~ynh2 **Demo:** ## Documentación e recursos diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 461c5df..142cbd5 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -18,7 +18,7 @@ Create simple online educational pathes -**分发版本:** 0.5.16~ynh1 +**分发版本:** 0.5.16~ynh2 **演示:** ## 文档与资源 diff --git a/conf/nginx.conf b/conf/nginx.conf index 82a7612..76228b3 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,7 +2,7 @@ location __PATH__/ { # Path to source - alias __INSTALL_DIR__/; + alias __INSTALL_DIR__/dist/; #index index.php; diff --git a/manifest.toml b/manifest.toml index 98de39d..5242f29 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Digisteps" description.en = "Create simple online educational pathes" description.fr = "Créer des parcours pédagogiques simples en ligne" -version = "0.5.16~ynh1" +version = "0.5.16~ynh2" maintainers = ["Pierre-Amiel Giraud"] diff --git a/scripts/backup b/scripts/backup index eedff3c..c207d85 100644 --- a/scripts/backup +++ b/scripts/backup @@ -22,7 +22,7 @@ ynh_print_info --message="Declaring files to be backed up..." ynh_backup --src_path="$install_dir" #================================================= -# BACKUP THE NGINX CONFIGURATION +# SYSTEM CONFIGURATION #================================================= ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" diff --git a/scripts/install b/scripts/install index ae8982d..54da618 100644 --- a/scripts/install +++ b/scripts/install @@ -20,9 +20,9 @@ chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= -# NGINX CONFIGURATION +# APP INITIAL CONFIGURATION #================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=1 +ynh_script_progression --message="Adding $app's configuration files..." --weight=1 ynh_add_nginx_config diff --git a/scripts/remove b/scripts/remove index ac762c0..a6a8ac5 100644 --- a/scripts/remove +++ b/scripts/remove @@ -10,9 +10,9 @@ source _common.sh source /usr/share/yunohost/helpers #================================================= -# REMOVE NGINX CONFIGURATION +# REMOVE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 +ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 ynh_remove_nginx_config diff --git a/scripts/restore b/scripts/restore index 908cf16..7aac2b5 100644 --- a/scripts/restore +++ b/scripts/restore @@ -20,9 +20,9 @@ chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= -# RESTORE THE PHP-FPM CONFIGURATION +# RESTORE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=1 +ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" diff --git a/scripts/upgrade b/scripts/upgrade index 96211e8..03cc0db 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,12 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -26,9 +20,9 @@ chmod -R o-rwx "$install_dir" chown -R "$app:www-data" "$install_dir" #================================================= -# NGINX CONFIGURATION +# REAPPLY SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 +ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 ynh_add_nginx_config