diff --git a/README.md b/README.md index 8ab0891..c70a7ec 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:** 24.05.4~ynh1 +**Shipped version:** 24.05.4~ynh2 **Demo:** diff --git a/README_es.md b/README_es.md index 60612cb..be77a40 100644 --- a/README_es.md +++ b/README_es.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Versión actual:** 24.05.4~ynh1 +**Versión actual:** 24.05.4~ynh2 **Demo:** diff --git a/README_eu.md b/README_eu.md index 727506d..47f7e31 100644 --- a/README_eu.md +++ b/README_eu.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Paketatutako bertsioa:** 24.05.4~ynh1 +**Paketatutako bertsioa:** 24.05.4~ynh2 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 8190f68..670a05d 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 :** 24.05.4~ynh1 +**Version incluse :** 24.05.4~ynh2 **Démo :** diff --git a/README_gl.md b/README_gl.md index 3671ea6..37d2392 100644 --- a/README_gl.md +++ b/README_gl.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Versión proporcionada:** 24.05.4~ynh1 +**Versión proporcionada:** 24.05.4~ynh2 **Demo:** diff --git a/README_id.md b/README_id.md index 9e13ab5..bb54bdc 100644 --- a/README_id.md +++ b/README_id.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Versi terkirim:** 24.05.4~ynh1 +**Versi terkirim:** 24.05.4~ynh2 **Demo:** diff --git a/README_ru.md b/README_ru.md index a360331..23026cd 100644 --- a/README_ru.md +++ b/README_ru.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**Поставляемая версия:** 24.05.4~ynh1 +**Поставляемая версия:** 24.05.4~ynh2 **Демо-версия:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 79cf31c..c55adcd 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -29,7 +29,7 @@ BookStack is an opinionated wiki system that provides a pleasant and simple out - Diagrams.net Integration -**分发版本：** 24.05.4~ynh1 +**分发版本：** 24.05.4~ynh2 **演示：** diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf deleted file mode 100644 index ce1fb1f..0000000 --- a/conf/extra_php-fpm.conf +++ /dev/null @@ -1,5 +0,0 @@ -; Additional php.ini defines, specific to this pool of workers. - -php_admin_value[upload_max_filesize] = 256M -php_admin_value[memory_limit] = 256M -php_admin_value[post_max_size] = 256M diff --git a/conf/nginx.conf b/conf/nginx.conf index e28991c..ffad685 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -8,12 +8,12 @@ location __PATH__/ { client_body_timeout 120s; # Default is 60, May need to be increased for very large uploads index index.php; - try_files $uri $uri/ @__NAME__; + try_files $uri $uri/ @__APP__; #try_files $uri $uri/ index.php; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; - fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; + fastcgi_pass unix:/var/run/php/php__PHP_VERSION__-fpm-__APP__.sock; fastcgi_index index.php; include fastcgi_params; fastcgi_param REMOTE_USER $remote_user; @@ -25,6 +25,6 @@ location __PATH__/ { include conf.d/yunohost_panel.conf.inc; } -location @__NAME__ { +location @__APP__ { rewrite ^__PATH__/(.*)$ __PATH__/index.php?/$1 last; } diff --git a/conf/systemd.service b/conf/systemd.service index a4209a4..c10326b 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -5,7 +5,7 @@ Description=BookStack: documentation/wiki content User=__APP__ Group=__APP__ Restart=always -ExecStart=/usr/bin/php__PHPVERSION__ __INSTALL_DIR__/artisan queue:work --sleep=3 --tries=1 --max-time=3600 +ExecStart=/usr/bin/php__PHP_VERSION__ __INSTALL_DIR__/artisan queue:work --sleep=3 --tries=1 --max-time=3600 # Sandboxing options to harden security # Depending on specificities of your service/app, you may need to tweak these diff --git a/config_panel.toml.example b/config_panel.toml.example deleted file mode 100644 index e7e457d..0000000 --- a/config_panel.toml.example +++ /dev/null @@ -1,39 +0,0 @@ -version = "1.0" - -[main] -name = "BookStack configuration" -services = ["__APP__"] - - [main.maintenance_mode] - name = "Maintenance mode" - - [main.maintenance_mode.maintenance_mode] - ask = "Enable maintenance mode" - type = "boolean" - default = "0" - - [main.php_fpm_config] - name = "PHP-FPM configuration" - - [main.php_fpm_config.fpm_footprint] - ask = "Memory footprint" - type = "select" - choices.low = "Low, <= 20Mb per pool" - choices.medium = "Medium, between 20Mb and 40Mb per pool" - choices.high = "High, > 40Mb per pool" - choices.specific = "Use specific value" - default = "low" - - [main.php_fpm_config.fpm_free_footprint] - visible = "fpm_footprint == 'specific'" - ask = "Memory footprint of the service?" - type = "number" - default = "0" - help = "Free field to specify exactly the footprint in Mb if you don't want to use one of the three previous values." - - [main.php_fpm_config.fpm_usage] - ask = "Expected usage" - type = "select" - choices = ["low", "medium", "high"] - default = "low" - help = "low: Personal usage, behind the SSO. No RAM footprint when not used, but the impact on the processor can be high if many users are using the service.
medium: Low usage, few people or/and publicly accessible. Low RAM footprint, medium processor footprint when used.
high: High usage, frequently visited website. High RAM footprint, but lower on processor usage and quickly responding." diff --git a/manifest.toml b/manifest.toml index 3765f6f..143a8b0 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 = "24.05.4~ynh1" +version = "24.05.4~ynh2" maintainers = [] @@ -19,6 +19,7 @@ code = "https://github.com/BookStackApp/BookStack" [integration] yunohost = ">= 11.2.29" +helpers_version = "2.1" architectures = "all" multi_instance = true @@ -67,6 +68,7 @@ ram.runtime = "50M" [resources.system_user] [resources.install_dir] + group = "www-data:r-x" [resources.permissions] main.url = "/" diff --git a/scripts/_common.sh b/scripts/_common.sh index cfc7520..4ebac4e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -1,19 +1,7 @@ #!/bin/bash #================================================= -# COMMON VARIABLES +# COMMON VARIABLES AND CUSTOM HELPERS #================================================= -YNH_COMPOSER_VERSION=2.5.8 - -#================================================= -# PERSONAL HELPERS -#================================================= - -#================================================= -# EXPERIMENTAL HELPERS -#================================================= - -#================================================= -# FUTURE OFFICIAL HELPERS -#================================================= +composer_version=2.5.8 diff --git a/scripts/backup b/scripts/backup index bc34329..35ecc75 100644 --- a/scripts/backup +++ b/scripts/backup @@ -1,44 +1,35 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# DECLARE DATA AND CONF FILES TO BACKUP -#================================================= -ynh_print_info --message="Declaring files to be backed up..." +ynh_print_info "Declaring files to be backed up..." #================================================= # BACKUP THE APP MAIN DIR #================================================= -ynh_backup --src_path="$install_dir" +ynh_backup "$install_dir" #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= -ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" +ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" -ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" +ynh_backup "/etc/php/$php_version/fpm/pool.d/$app.conf" -ynh_backup --src_path="/etc/systemd/system/$app.service" +ynh_backup "/etc/systemd/system/$app.service" #================================================= # BACKUP THE MYSQL DATABASE #================================================= -ynh_print_info --message="Backing up the MySQL database..." +ynh_print_info "Backing up the MySQL database..." -ynh_mysql_dump_db --database="$db_name" > db.sql +ynh_mysql_dump_db > db.sql #================================================= # END OF SCRIPT #================================================= -ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." +ynh_print_info "Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/change_url b/scripts/change_url index 49a7f35..6d277e0 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -1,56 +1,44 @@ #!/bin/bash -#================================================= -# GENERIC STARTING -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source _common.sh source /usr/share/yunohost/helpers -#================================================= -# STANDARD MODIFICATIONS #================================================= # STOP SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Stopping a systemd service..." --weight=1 +ynh_script_progression "Stopping $app's systemd service..." -ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" +ynh_systemctl --service=$app --action="stop" --log_path="systemd" -#================================================= -# STANDARD MODIFICATIONS #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 +ynh_script_progression "Updating NGINX web server configuration..." -ynh_change_url_nginx_config +ynh_config_change_url_nginx #================================================= # MODIFY A CONFIG FILE #================================================= -ynh_script_progression --message="Reconfiguring congif file.." --weight=1 +ynh_script_progression "Reconfiguring congif file.." old_app_url_domain="https://${old_domain}${old_path%/}" pushd $install_dir - yes | php$phpversion artisan bookstack:update-url $old_app_url_domain https://${new_domain}${new_path} + yes | php$php_version artisan bookstack:update-url $old_app_url_domain https://${new_domain}${new_path} popd sed -i "/APP_URL=/c\APP_URL=https://${new_domain}${new_path}" $install_dir/.env -#================================================= -# GENERIC FINALISATION #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --weight=1 +ynh_script_progression "Starting $app's systemd service..." -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" +ynh_systemctl --service=$app --action="start" --log_path="systemd" #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Change of URL completed for $app" --last +ynh_script_progression "Change of URL completed for $app" diff --git a/scripts/config b/scripts/config deleted file mode 100644 index c13b81b..0000000 --- a/scripts/config +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/bash - -#================================================= -# GENERIC STARTING -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - -source _common.sh -source /usr/share/yunohost/helpers - -ynh_abort_if_errors - -#================================================= -# RETRIEVE ARGUMENTS -#================================================= - -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) -current_fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) - -#================================================= -# SPECIFIC GETTERS FOR TOML SHORT KEY -#================================================= - -get__maintenance_mode() { - # Maintenance mode status - if [ -f $install_dir/.maintenance ] - then - echo "1" - else - echo "0" - fi -} - -get__fpm_footprint() { - # Free footprint value for php-fpm - # Check if current_fpm_footprint is an integer - if [ "$current_fpm_footprint" -eq "$current_fpm_footprint" ] 2> /dev/null - then - echo "specific" - else - echo "$current_fpm_footprint" - fi -} - -get__free_footprint() { - # Free footprint value for php-fpm - # Check if current_fpm_footprint is an integer - if [ "$current_fpm_footprint" -eq "$current_fpm_footprint" ] 2> /dev/null - then - # If current_fpm_footprint is an integer, that's a numeric value for the footprint - echo "$current_fpm_footprint" - else - echo "0" - fi -} - -#================================================= -# SPECIFIC SETTERS FOR TOML SHORT KEYS -#================================================= - -set__maintenance_mode() { - if [ "$maintenance_mode" -eq "1" ]; then - # If maintenance_mode was set to 1, enable maintenance mode - (cd "$install_dir" && ynh_exec_as "$app" \ - echo "Site under maintenance." > .maintenance) - ynh_print_info "Maintenance mode disabled" - elif [ "$maintenance_mode" -eq "0" ]; then - # If maintenance_mode was set to 0, disable maintenance mode - ynh_secure_remove --file=$install_dir/.maintenance - ynh_print_info "Maintenance mode enabled" - fi - ynh_app_setting_set --app=$app --key=maintenance_mode --value="$maintenance_mode" -} - -set__fpm_footprint() { - if [ "$fpm_footprint" != "specific" ] - then - ynh_app_setting_set --app=$app --key=fpm_footprint --value="$fpm_footprint" - fi -} - -set__fpm_free_footprint() { - if [ "$fpm_footprint" = "specific" ] - then - ynh_app_setting_set --app=$app --key=fpm_footprint --value="$fpm_free_footprint" - fi -} - -#================================================= -# GENERIC FINALIZATION -#================================================= - -ynh_app_config_validate() { - _ynh_app_config_validate - - if [ "${changed[fpm_usage]}" == "true" ] || [ "${changed[fpm_footprint]}" == "true" ] || [ "${changed[fpm_free_footprint]}" == "true" ]; then - # If fpm_footprint is set to 'specific', use $fpm_free_footprint value. - if [ "$fpm_footprint" = "specific" ] - then - fpm_footprint=$fpm_free_footprint - fi - - if [ "$fpm_footprint" == "0" ] - then - ynh_print_err --message="When selecting 'specific', you have to set a footprint value into the field below." - - exit 0 - fi - fi -} - -ynh_app_config_apply() { - _ynh_app_config_apply - - ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint -} - -ynh_app_config_run $1 diff --git a/scripts/install b/scripts/install index fca325a..cc09242 100644 --- a/scripts/install +++ b/scripts/install @@ -1,14 +1,12 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source _common.sh source /usr/share/yunohost/helpers +ynh_app_setting_set --key=php_upload_max_filesize --value=256M + +ynh_app_setting_set --key=php_memory_limit --value=256M + #================================================= # RETRIEVE ARGUMENTS FROM THE MANIFEST #================================================= @@ -21,80 +19,71 @@ email=$(ynh_user_get_info --username=$admin --key=mail) # STORE SETTINGS FROM MANIFEST #================================================= -ynh_app_setting_set --app=$app --key=redis_db --value=$redis_db +ynh_app_setting_set --key=redis_db --value=$redis_db #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Setting up source files..." --weight=7 +ynh_script_progression "Setting up source files..." ynh_setup_source --dest_dir="$install_dir" #================================================= # SYSTEM CONFIGURATION #================================================= -ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 +ynh_script_progression "Adding system configurations related to $app..." -# Create a dedicated PHP-FPM config -ynh_add_fpm_config +ynh_config_add_phpfpm -# Create a dedicated NGINX config -ynh_add_nginx_config +ynh_config_add_nginx -# Create a dedicated systemd config -ynh_add_systemd_config +ynh_config_add_systemd yunohost service add $app --description="Platform to create documentation/wiki content" --log="/var/log/$app/$app.log" #================================================= # INSTALL BOOKSTACK WITH COMPOSER #================================================= -ynh_script_progression --message="Installing $app with Composer..." --weight=5 +ynh_script_progression "Installing $app with Composer..." -# Install composer -ynh_install_composer +ynh_composer_install +ynh_composer_exec install --no-dev #================================================= # MODIFY A CONFIG FILE #================================================= -ynh_script_progression --message="Adding a configuration file..." --weight=1 +ynh_script_progression "Adding $app's configuration..." app_url_domain="https://$domain${path%/}" -ynh_add_config --template=.env --destination=$install_dir/.env - -chmod 640 $install_dir/.env -chown $app:$app $install_dir/.env +ynh_config_add --template=.env --destination=$install_dir/.env #================================================= # FINAL BOOKSTACK INSTALL #================================================= -ynh_script_progression --message="Install $app" --weight=5 +ynh_script_progression "Install $app" pushd $install_dir - php$phpversion artisan key:generate --no-interaction --force - php$phpversion artisan migrate --no-interaction --force - php$phpversion artisan bookstack:create-admin --email="$email" --name="$admin" --external-auth-id="$admin" + php$php_version artisan key:generate --no-interaction --force + php$php_version artisan migrate --no-interaction --force + php$php_version 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 #================================================= -ynh_script_progression --message="Starting a systemd service..." --weight=1 +ynh_script_progression "Starting $app's systemd service..." -# Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" +ynh_systemctl --service=$app --action="start" --log_path="systemd" #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of $app completed" --last +ynh_script_progression "Installation of $app completed" diff --git a/scripts/remove b/scripts/remove index 38872bb..52d7b5e 100644 --- a/scripts/remove +++ b/scripts/remove @@ -1,41 +1,32 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source _common.sh source /usr/share/yunohost/helpers #================================================= # REMOVE SYSTEM CONFIGURATIONS #================================================= -# REMOVE SYSTEMD SERVICE -#================================================= -ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 +# REMOVE SYSTEMD SERVICE -# 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 +#================================================= +ynh_script_progression "Removing system configurations related to $app..." + +if ynh_hide_warnings yunohost service status $app >/dev/null then - ynh_script_progression --message="Removing $app service integration..." --weight=1 + ynh_script_progression "Removing $app service integration..." yunohost service remove $app fi -# Remove the dedicated systemd config -ynh_remove_systemd_config +ynh_config_remove_systemd ynh_redis_remove_db "$redis_db" -# Remove the dedicated NGINX config -ynh_remove_nginx_config +ynh_config_remove_nginx -# Remove the dedicated PHP-FPM config -ynh_remove_fpm_config +ynh_config_remove_phpfpm #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Removal of $app completed" --last +ynh_script_progression "Removal of $app completed" diff --git a/scripts/restore b/scripts/restore index e77263d..30d8c6f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -1,64 +1,51 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers #================================================= # RESTORE THE APP MAIN DIR #================================================= -ynh_script_progression --message="Restoring the app main directory..." --weight=1 +ynh_script_progression "Restoring the app main directory..." -ynh_restore_file --origin_path="$install_dir" +ynh_restore "$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 640 $install_dir/.env #================================================= # RESTORE THE MYSQL DATABASE #================================================= -ynh_script_progression --message="Restoring the MySQL database..." --weight=2 +ynh_script_progression "Restoring the MySQL database..." -ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql +ynh_mysql_db_shell < ./db.sql #================================================= # RESTORE SYSTEM CONFIGURATIONS #================================================= -# RESTORE THE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 +ynh_script_progression "Restoring system configurations related to $app..." -ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" +ynh_restore "/etc/php/$php_version/fpm/pool.d/$app.conf" -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" +ynh_restore "/etc/nginx/conf.d/$domain.d/$app.conf" -ynh_restore_file --origin_path="/etc/systemd/system/$app.service" +ynh_restore "/etc/systemd/system/$app.service" systemctl enable $app.service --quiet yunohost service add $app --description="Platform to create documentation/wiki content" --log="/var/log/$app/$app.log" -#================================================= -# GENERIC FINALIZATION #================================================= # RELOAD NGINX AND PHP-FPM OR THE APP SERVICE #================================================= -ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1 +ynh_script_progression "Reloading NGINX web server and $app's service..." -ynh_systemd_action --service_name=php$phpversion-fpm --action=reload -ynh_systemd_action --service_name=nginx --action=reload +ynh_systemctl --service=php$php_version-fpm --action=reload +ynh_systemctl --service=nginx --action=reload -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" +ynh_systemctl --service=$app --action="start" --log_path="systemd" #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Restoration completed for $app" --last +ynh_script_progression "Restoration completed for $app" diff --git a/scripts/upgrade b/scripts/upgrade index d946625..dfc3886 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -1,86 +1,77 @@ #!/bin/bash -#================================================= -# GENERIC START -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - source _common.sh source /usr/share/yunohost/helpers +ynh_app_setting_set_default --key=php_upload_max_filesize --value=256M + +ynh_app_setting_set_default --key=php_memory_limit --value=256M + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Upgrading source files..." --weight=1 +ynh_script_progression "Upgrading source files..." -# Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep=".env public/uploads storage/uploads" +ynh_setup_source --dest_dir="$install_dir" --full_replace --keep=".env public/uploads storage/uploads" #================================================= # REAPPLY SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 +ynh_script_progression "Upgrading system configurations related to $app..." +ynh_config_add_phpfpm -# Create a dedicated PHP-FPM config -ynh_add_fpm_config +ynh_config_add_nginx -# Create a dedicated NGINX config -ynh_add_nginx_config - -# Create a dedicated systemd config -ynh_add_systemd_config +ynh_config_add_systemd yunohost service add $app --description="Platform to create documentation/wiki content" --log="/var/log/$app/$app.log" #================================================= # INSTALL LYCHEE WITH COMPOSER #================================================= -ynh_script_progression --message="Installing BookStack with Composer..." --weight=5 +ynh_script_progression "Installing BookStack with Composer..." -# Install composer -ynh_install_composer +ynh_composer_install +ynh_composer_exec install --no-dev #================================================= # MODIFY A CONFIG FILE #================================================= -#ynh_script_progression --message="Adding a configuration file..." --weight=1 +#ynh_script_progression "Adding $app's configuration..." #timezone="$(cat /etc/timezone)" #app_url_domain="https://$domain${path%/}" -#ynh_add_config --template=.env --destination=$install_dir/.env +#ynh_config_add --template=.env --destination=$install_dir/.env #================================================= # FINAL BOOKSTACK INSTALL #================================================= -ynh_script_progression --message="Install BookStack" --weight=5 +ynh_script_progression "Install BookStack" pushd $install_dir - php$phpversion artisan migrate --force - php$phpversion artisan key:generate --force - php$phpversion artisan cache:clear - php$phpversion artisan config:clear - php$phpversion artisan view:clear + php$php_version artisan migrate --force + php$php_version artisan key:generate --force + php$php_version artisan cache:clear + php$php_version artisan config:clear + php$php_version 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 #================================================= -ynh_script_progression --message="Starting a systemd service..." --weight=1 +ynh_script_progression "Starting $app's systemd service..." -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" +ynh_systemctl --service=$app --action="start" --log_path="systemd" #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Upgrade of $app completed" --last +ynh_script_progression "Upgrade of $app completed"