YunoHost-Apps/automad_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/automad_ynh.git synced 2024-09-03 18:06:04 +02:00
Code Issues Activity Actions

Merge pull request #5 from YunoHost-Apps/testing

Browse source 
Testing
This commit is contained in:
Éric Gaspar 2022-09-15 20:50:40 +02:00 • committed by GitHub
commit e6ccd57cf2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 29 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -19,7 +19,6 @@ A flat-file content management system and template engine
**Shipped version:** 1.10.9~ynh2 **Shipped version:** 1.10.9~ynh2
**Demo:** https://demo.example.com
## Screenshots ## Screenshots

3
README_fr.md
View file

@ -17,9 +17,8 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
A flat-file content management system and template engine A flat-file content management system and template engine
**Version incluse :** 1.10.9~ynh2 **Version incluse :** 1.10.9~ynh2
**Démo :** https://demo.example.com
## Captures d'écran ## Captures d'écran

10
manifest.json
View file

@ -11,10 +11,10 @@
"upstream": { "upstream": {
"license": "MIT", "license": "MIT",
"website": "https://automad.org/", "website": "https://automad.org/",
"demo": "https://demo.example.com",
"admindoc": "https://automad.org/getting-started", "admindoc": "https://automad.org/getting-started",
"userdoc": "https://automad.org/user-guide", "userdoc": "https://automad.org/user-guide",
"code": "https://github.com/marcantondahmen/automad" "code": "https://github.com/marcantondahmen/automad",
"cpe": "cpe:2.3:a:automad:automad"
}, },
"license": "MIT", "license": "MIT",
"maintainer": { "maintainer": {
@ -22,7 +22,7 @@
"email": "" "email": ""
}, },
"requirements": { "requirements": {
"yunohost": ">= 4.3.0" "yunohost": ">= 11.0.9"
}, },
"multi_instance": true, "multi_instance": true,
"services": [ "services": [
@ -30,7 +30,7 @@
"php8.0-fpm" "php8.0-fpm"
], ],
"arguments": { "arguments": {
"install" : [ "install": [
{ {
"name": "domain", "name": "domain",
"type": "domain" "type": "domain"
@ -48,4 +48,4 @@
} }
] ]
} }
} }

16
scripts/install
View file

@ -78,14 +78,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="Configuring NGINX web server..." --weight=1
# Create a dedicated NGINX config
ynh_add_nginx_config
#================================================= #=================================================
# PHP-FPM CONFIGURATION # PHP-FPM CONFIGURATION
#================================================= #=================================================
@ -94,6 +86,14 @@ ynh_script_progression --message="Configuring PHP-FPM..." --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="Configuring NGINX web server..." --weight=1
# Create a dedicated NGINX config
ynh_add_nginx_config
#================================================= #=================================================
# SETUP FIRST USER # SETUP FIRST USER
#================================================= #=================================================

14
scripts/restore
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
#================================================= #=================================================

16
scripts/upgrade
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
#================================================= #=================================================