1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/wondercms_ynh.git synced 2024-09-03 18:06:16 +02:00

Merge pull request #3 from YunoHost-Apps/testing

Testing
This commit is contained in:
Éric Gaspar 2022-08-26 22:26:30 +02:00 committed by GitHub
commit 0f5c0ed499
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 20 deletions

View file

@ -17,7 +17,8 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
WonderCMS is an extremely small flat file CMS. It's fast, responsive and doesn't require any configuration. WonderCMS is an extremely small flat file CMS. It's fast, responsive and doesn't require any configuration.
**Shipped version:** 3.3.2~ynh2 **Shipped version:** 3.3.2~ynh3
**Demo:** https://www.wondercms.com/demo/ **Demo:** https://www.wondercms.com/demo/

View file

@ -17,7 +17,8 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
WonderCMS is an extremely small flat file CMS. It's fast, responsive and doesn't require any configuration. WonderCMS is an extremely small flat file CMS. It's fast, responsive and doesn't require any configuration.
**Version incluse :** 3.3.2~ynh2 **Version incluse :** 3.3.2~ynh3
**Démo :** https://www.wondercms.com/demo/ **Démo :** https://www.wondercms.com/demo/

View file

@ -6,7 +6,7 @@
"en": "Fast and small flat file CMS", "en": "Fast and small flat file CMS",
"fr": "CMS rapide sans base de données" "fr": "CMS rapide sans base de données"
}, },
"version": "3.3.2~ynh2", "version": "3.3.2~ynh3",
"url": "https://wondercms.com", "url": "https://wondercms.com",
"upstream": { "upstream": {
"license": "MIT", "license": "MIT",
@ -21,7 +21,7 @@
"email": "" "email": ""
}, },
"requirements": { "requirements": {
"yunohost": ">= 4.3.0" "yunohost": ">= 11.0.9"
}, },
"multi_instance": true, "multi_instance": true,
"services": [ "services": [
@ -29,7 +29,7 @@
"php8.0-fpm" "php8.0-fpm"
], ],
"arguments": { "arguments": {
"install" : [ "install": [
{ {
"name": "domain", "name": "domain",
"type": "domain" "type": "domain"

View file

@ -43,13 +43,6 @@ test ! -d $final_path \
#================================================= #=================================================
# STANDARD RESTORATION STEPS # STANDARD RESTORATION STEPS
#=================================================
# RESTORE THE NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1
ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
#================================================= #=================================================
# RECREATE THE DEDICATED USER # RECREATE THE DEDICATED USER
#================================================= #=================================================
@ -84,6 +77,13 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig
ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
#=================================================
# RESTORE THE NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1
ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
#================================================= #=================================================
# GENERIC FINALIZATION # GENERIC FINALIZATION
#================================================= #=================================================

View file

@ -64,14 +64,6 @@ chmod 750 "$final_path"
chmod -R o-rwx "$final_path" chmod -R o-rwx "$final_path"
chown -R $app:www-data "$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 # UPGRADE DEPENDENCIES
#================================================= #=================================================
@ -87,6 +79,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1
# Create a dedicated PHP-FPM config # Create a dedicated PHP-FPM config
ynh_add_fpm_config ynh_add_fpm_config
#=================================================
# NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
# Create a dedicated NGINX config
ynh_add_nginx_config
#================================================= #=================================================
# RELOAD NGINX # RELOAD NGINX
#================================================= #=================================================