diff --git a/manifest.toml b/manifest.toml index 725d621..7b07b99 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ admindoc = "https://easyappointments.org/docs.html#1.4.3/readme.md" code = "https://github.com/alextselegidis/easyappointments" [integration] -yunohost = ">= 11.2.18" +yunohost = ">= 11.2.20" helpers_version = "2.1" architectures = "all" multi_instance = true diff --git a/scripts/backup b/scripts/backup index 5dd8e98..a639fa7 100644 --- a/scripts/backup +++ b/scripts/backup @@ -1,6 +1,5 @@ #!/bin/bash -# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers diff --git a/scripts/change_url b/scripts/change_url index 73566da..ef97db4 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -10,8 +10,6 @@ ynh_script_progression "Updating NGINX web server configuration..." ynh_config_change_url_nginx -#================================================= -# SPECIFIC MODIFICATIONS #================================================= # UPDATE A CONFIG FILE #================================================= @@ -20,9 +18,6 @@ ynh_script_progression "Updating configuration..." domain=$new_domain ynh_config_add --template="config.php" --destination="$install_dir/config.php" -#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 400 "$install_dir/config.php" -#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/config.php" - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/install b/scripts/install index 82739d3..65213b0 100644 --- a/scripts/install +++ b/scripts/install @@ -10,8 +10,6 @@ ynh_script_progression "Setting up source files..." ynh_setup_source --dest_dir="$install_dir" -#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" -#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" chmod -R 770 "$install_dir/storage" #================================================= @@ -32,9 +30,6 @@ ynh_script_progression "Adding $app's configuration..." ynh_config_add --template="config.php" --destination="$install_dir/config.php" -#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 400 "$install_dir/config.php" -#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 "$install_dir/config.php" - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/remove b/scripts/remove index aca89fd..ee9c6ec 100644 --- a/scripts/remove +++ b/scripts/remove @@ -5,9 +5,6 @@ source /usr/share/yunohost/helpers #================================================= # REMOVE SYSTEM CONFIGURATIONS -#================================================= -# REMOVE SYSTEMD SERVICE - #================================================= ynh_script_progression "Removing system configurations related to $app..." diff --git a/scripts/restore b/scripts/restore index ea2c2a7..b0a33df 100644 --- a/scripts/restore +++ b/scripts/restore @@ -1,6 +1,5 @@ #!/bin/bash -# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers @@ -11,8 +10,6 @@ ynh_script_progression "Restoring the app main directory..." ynh_restore "$install_dir" -#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" -#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" #================================================= # RESTORE THE MYSQL DATABASE #================================================= @@ -23,8 +20,6 @@ ynh_mysql_db_shell < ./db.sql #================================================= # RESTORE SYSTEM CONFIGURATIONS #================================================= -# RESTORE THE PHP-FPM CONFIGURATION -#================================================= ynh_script_progression "Restoring system configurations related to $app..." ynh_restore "/etc/php/$php_version/fpm/pool.d/$app.conf" diff --git a/scripts/upgrade b/scripts/upgrade index 91b0c24..58ba89f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -10,13 +10,10 @@ ynh_script_progression "Upgrading source files..." ynh_setup_source --dest_dir="$install_dir" --keep="config.php storage/" -#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" -#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" chmod -R 770 "$install_dir/storage" pushd "$install_dir" php$php_version $install_dir/index.php console migrate - popd #=================================================