diff --git a/manifest.toml b/manifest.toml index e87ad80..ece3aa0 100644 --- a/manifest.toml +++ b/manifest.toml @@ -18,7 +18,7 @@ userdoc = "https://www.bookstackapp.com/docs/user/" code = "https://github.com/BookStackApp/BookStack" [integration] -yunohost = ">= 11.2.18" +yunohost = ">= 11.2.29" helpers_version = "2.1" architectures = "all" multi_instance = true diff --git a/scripts/install b/scripts/install index 891a0a3..cc09242 100644 --- a/scripts/install +++ b/scripts/install @@ -33,13 +33,10 @@ ynh_setup_source --dest_dir="$install_dir" #================================================= ynh_script_progression "Adding system configurations related to $app..." -# Create a dedicated PHP-FPM config ynh_config_add_phpfpm -# Create a dedicated NGINX config ynh_config_add_nginx -# Create a dedicated systemd config ynh_config_add_systemd yunohost service add $app --description="Platform to create documentation/wiki content" --log="/var/log/$app/$app.log" @@ -49,7 +46,6 @@ yunohost service add $app --description="Platform to create documentation/wiki c #================================================= ynh_script_progression "Installing $app with Composer..." -# Install composer ynh_composer_install ynh_composer_exec install --no-dev @@ -62,9 +58,6 @@ app_url_domain="https://$domain${path%/}" ynh_config_add --template=.env --destination=$install_dir/.env -#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod 640 $install_dir/.env -#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown $app:$app $install_dir/.env - #================================================= # FINAL BOOKSTACK INSTALL #================================================= @@ -80,15 +73,13 @@ popd # SET PERMISSIONS #================================================= -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx $install_dir chmod -R 775 $install_dir/storage $install_dir/bootstrap/cache $install_dir/public/uploads -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data $install_dir + #================================================= # START SYSTEMD SERVICE #================================================= ynh_script_progression "Starting $app's systemd service..." -# Start a systemd service ynh_systemctl --service=$app --action="start" --log_path="systemd" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 5ca569c..83304e5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,7 +12,6 @@ ynh_app_setting_set_default --key=php_memory_limit --value=256M #================================================= 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 --keep=".env public/uploads storage/uploads" #================================================= @@ -20,13 +19,10 @@ ynh_setup_source --dest_dir="$install_dir" --full_replace --keep=".env public/up #================================================= ynh_script_progression "Upgrading system configurations related to $app..." -# Create a dedicated PHP-FPM config ynh_config_add_phpfpm -# Create a dedicated NGINX config ynh_config_add_nginx -# Create a dedicated systemd config ynh_config_add_systemd yunohost service add $app --description="Platform to create documentation/wiki content" --log="/var/log/$app/$app.log" @@ -36,7 +32,6 @@ yunohost service add $app --description="Platform to create documentation/wiki c #================================================= ynh_script_progression "Installing BookStack with Composer..." -# Install composer ynh_composer_install ynh_composer_exec install --no-dev @@ -67,9 +62,8 @@ popd # SET PERMISSIONS #================================================= -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx $install_dir chmod -R 775 $install_dir/storage $install_dir/bootstrap/cache $install_dir/public/uploads -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data $install_dir + #================================================= # START SYSTEMD SERVICE #=================================================