diff --git a/conf/nginx.conf b/conf/nginx.conf index e93892c..78174bd 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -10,9 +10,6 @@ location /Microsoft-Server-ActiveSync { rewrite ^ https://$server_name$request_uri? permanent; } -### Example PHP configuration (remove it if not used) - #index index.php; - # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file client_max_body_size 20m; client_body_buffer_size 128k; @@ -22,8 +19,6 @@ location /Microsoft-Server-ActiveSync { fastcgi_param HTTPS on; fastcgi_param SCRIPT_FILENAME $request_filename; -### End of PHP configuration part - # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; } diff --git a/scripts/backup b/scripts/backup index 5c28bfb..beaedde 100755 --- a/scripts/backup +++ b/scripts/backup @@ -13,10 +13,6 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - ### Remove this function if there's nothing to clean before calling the remove script. - true -} # Exit if an error occurs during the execution of the script ynh_abort_if_errors diff --git a/scripts/install b/scripts/install index e604db1..3202b11 100755 --- a/scripts/install +++ b/scripts/install @@ -8,15 +8,12 @@ source _common.sh source /usr/share/yunohost/helpers +source ynh_add_secure_repos__2 #================================================= # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - ### Remove this function if there's nothing to clean before calling the remove script. - true -} # Exit if an error occurs during the execution of the script ynh_abort_if_errors @@ -183,10 +180,6 @@ fi # STORE THE CONFIG FILE CHECKSUM #================================================= -### `ynh_store_file_checksum` is used to store the checksum of a file. -### That way, during the upgrade script, by using `ynh_backup_if_checksum_is_different`, -### you can make a backup of this file before modifying it again if the admin had modified it. - # Calculate and store the config file checksum into the app settings ynh_store_file_checksum "$config_path/policies.ini" ynh_store_file_checksum "$config_path/z-push.conf.php" diff --git a/scripts/restore b/scripts/restore index 1d7d726..0af425d 100755 --- a/scripts/restore +++ b/scripts/restore @@ -8,15 +8,12 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers +source ../settings/scripts/ynh_add_secure_repos__2 #================================================= # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - #### Remove this function if there's nothing to clean before calling the remove script. - true -} # Exit if an error occurs during the execution of the script ynh_abort_if_errors diff --git a/scripts/upgrade b/scripts/upgrade index 81a1708..bf76fea 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -8,6 +8,7 @@ source _common.sh source /usr/share/yunohost/helpers +source ynh_add_secure_repos__2 #================================================= # LOAD SETTINGS