From 36c2151a39fc5ea6ce9eaf89e98592fe287edbca Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 9 Oct 2023 10:49:04 +0200 Subject: [PATCH] Testing (#141) * restart config panel * Update manifest.toml * Standard (#119) * fix * Update manifest.toml * Update manifest.toml * Update POST_INSTALL.md * Update POST_INSTALL_fr.md * fix * Update manifest.toml * Auto-update README * Update tests.toml * Update tests.toml * remove standard * Update manifest.toml * Auto-update README * Update tests.toml * Update manifest.toml * Update manifest.toml * Update install * Update manifest.toml * Auto-update README * Update manifest.toml * Auto-update README * cleaning * Update manifest.toml * Auto-update README * Update manifest.toml * Auto-update README * Upgrade to v23.6.2 (#128) * Upgrade to v23.6.2 * Auto-update README * Auto-update README * Update manifest.toml * Add maintenance * Update config_panel.toml * Update config * Update config_panel.toml * Update config * Update manifest.toml * Update config * Update config * fix * Update manifest.toml * Auto-update README * Update manifest.toml * Auto-update README * Update manifest.toml * Auto-update README * Update manifest.toml * Update manifest.toml * Auto-update README * Update manifest.toml * Auto-update README * Mail (#139) * fix mail * Auto-update README * Update .env.example * Update .env.example * Update .env.example * Update .env.example * Update .env.example --------- Co-authored-by: yunohost-bot * Update manifest.toml * Auto-update README * Update manifest.toml * Update install * fix * fix * Auto-update README * Update systemd.service --------- Co-authored-by: yunohost-bot Co-authored-by: YunoHost Bot --- README.md | 2 +- README_fr.md | 2 +- conf/systemd.service | 2 +- manifest.toml | 2 +- scripts/install | 14 ++++++++------ scripts/restore | 3 ++- scripts/upgrade | 14 +++++++++----- 7 files changed, 23 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 650a3c9..6b59531 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Shipped version:** 23.08.3~ynh2 +**Shipped version:** 23.08.3~ynh3 **Demo:** https://demo.bookstackapp.com diff --git a/README_fr.md b/README_fr.md index 7eb9a3a..faabeb5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ BookStack est un système wiki simple prête à l'emploi. Les nouveaux utilisate - Multilingue -**Version incluse :** 23.08.3~ynh2 +**Version incluse :** 23.08.3~ynh3 **Démo :** https://demo.bookstackapp.com diff --git a/conf/systemd.service b/conf/systemd.service index 15cd84a..a4209a4 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -1,5 +1,5 @@ [Unit] -Description=BookStack Queue Worker +Description=BookStack: documentation/wiki content [Service] User=__APP__ diff --git a/manifest.toml b/manifest.toml index 0759614..b118d77 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "BookStack" description.en = "Platform to create documentation/wiki content" description.fr = "Plateforme pour créer du contenu de documentation/wiki" -version = "23.08.3~ynh2" +version = "23.08.3~ynh3" maintainers = ["eric_G"] diff --git a/scripts/install b/scripts/install index 8a23e4d..2bdb5b4 100644 --- a/scripts/install +++ b/scripts/install @@ -37,12 +37,6 @@ ynh_script_progression --message="Setting up source files..." --weight=7 ynh_setup_source --dest_dir="$install_dir" -# Set permissions to app files -chmod -R o-rwx $install_dir -chmod -R 775 $install_dir/storage $install_dir/bootstrap/cache $install_dir/public/uploads - -chown -R $app:www-data $install_dir - #================================================= # SYSTEM CONFIGURATION #================================================= @@ -90,6 +84,14 @@ pushd $install_dir php$phpversion artisan bookstack:create-admin --email="$email" --name="$admin" --external-auth-id="$admin" popd +#================================================= +# SET PERMISSIONS +#================================================= + +chmod -R o-rwx $install_dir +chmod -R 775 $install_dir/storage $install_dir/bootstrap/cache $install_dir/public/uploads +chown -R $app:www-data $install_dir + #================================================= # START SYSTEMD SERVICE #================================================= diff --git a/scripts/restore b/scripts/restore index 8a6cbfc..a2ea5e3 100644 --- a/scripts/restore +++ b/scripts/restore @@ -18,8 +18,9 @@ ynh_restore_file --origin_path="$install_dir" # Restore permissions on app files chmod -R o-rwx $install_dir +chmod -R 775 $install_dir/storage $install_dir/bootstrap/cache $install_dir/public/uploads chown -R $app:www-data $install_dir -chmod 600 $install_dir/.env +chmod 640 $install_dir/.env #================================================= # RESTORE THE MYSQL DATABASE diff --git a/scripts/upgrade b/scripts/upgrade index 0d5d5d1..5ca9964 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -50,17 +50,13 @@ then ynh_setup_source --dest_dir="$install_dir" --keep=".env public/uploads storage/uploads" fi -chmod -R o-rwx $install_dir -chmod -R 775 $install_dir/storage $install_dir/bootstrap/cache $install_dir/public/uploads -chown -R $app:www-data $install_dir - #================================================= # REAPPLY SYSTEM CONFIGURATIONS #================================================= ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint +ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint # Create a dedicated NGINX config ynh_add_nginx_config @@ -101,6 +97,14 @@ pushd $install_dir php$phpversion artisan view:clear popd +#================================================= +# SET PERMISSIONS +#================================================= + +chmod -R o-rwx $install_dir +chmod -R 775 $install_dir/storage $install_dir/bootstrap/cache $install_dir/public/uploads +chown -R $app:www-data $install_dir + #================================================= # START SYSTEMD SERVICE #=================================================