From 71139bcaa137c46bd8fef7a77e1c3c7cfaefc40c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Tue, 28 Nov 2023 22:06:09 +0100 Subject: [PATCH 1/4] Fix install --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index f11ee9e..a04e8fa 100644 --- a/scripts/install +++ b/scripts/install @@ -27,6 +27,7 @@ fi ynh_script_progression --message="Creating base directory..." ln -s $data_dir $install_dir/seafile-data +mkdir -p $install_dir/logs if [ -n "$(ls -A $data_dir)" ]; then old_data_dir_path="${data_dir}_$(date '+%Y%m%d.%H%M%S')" From 912acd8c651cf0bdaeb6fa6a6b534d79e91eeb71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 29 Nov 2023 09:03:26 +0100 Subject: [PATCH 2/4] Don't need to create log file as it's already managed by fail2ban helper --- scripts/install | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/install b/scripts/install index a04e8fa..e4f59c9 100644 --- a/scripts/install +++ b/scripts/install @@ -111,7 +111,6 @@ ln -s $install_dir/logs /var/log/seafile # Add fail2ban ynh_script_progression --message="Configuring fail2ban..." -touch $install_dir/logs/seahub.log ynh_add_fail2ban_config --use_template #================================================= From da0bd7d81bd7e55a57cc3de9ba4ae88c3f72f7b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 6 Dec 2023 10:23:27 +0100 Subject: [PATCH 3/4] Simplify change-url as it's fixed by upsteam --- manifest.toml | 2 +- scripts/change_url | 32 -------------------------------- 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/manifest.toml b/manifest.toml index c0f1614..f57f9d7 100644 --- a/manifest.toml +++ b/manifest.toml @@ -18,7 +18,7 @@ code = "https://github.com/haiwen/seafile-server" cpe = "cpe:2.3:a:seafile:seafile" [integration] -yunohost = ">= 11.2.3" +yunohost = ">= 11.2.8" architectures = ["amd64", "arm64", "armhf"] multi_instance = false ldap = true diff --git a/scripts/change_url b/scripts/change_url index 7b0649d..d5834ae 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -11,9 +11,6 @@ source ./_common.sh # Source YunoHost helpers source /usr/share/yunohost/helpers -path=$new_path -domain=$new_domain - # Create special path with / at the end if [[ $path == '/' ]] then @@ -22,35 +19,6 @@ else path2=$path"/" fi -# Patch helper - -ynh_change_url_nginx_config() { - local old_nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf - local new_nginx_conf_path=/etc/nginx/conf.d/$new_domain.d/$app.conf - - # Change the domain for NGINX - if [ $change_domain -eq 1 ] - then - ynh_delete_file_checksum --file="$old_nginx_conf_path" - mv "$old_nginx_conf_path" "$new_nginx_conf_path" - ynh_store_file_checksum --file="$new_nginx_conf_path" - fi - - # Change the path in the NGINX config file - if [ $change_path -eq 1 ] - then - # Make a backup of the original NGINX config file if modified - ynh_backup_if_checksum_is_different --file="$new_nginx_conf_path" - # Set global variables for NGINX helper - path="$new_path" - path_url="$new_path" - # Create a dedicated NGINX config - ynh_add_nginx_config - fi - - ynh_systemd_action --service_name=nginx --action=reload -} - #================================================= # STANDARD MODIFICATIONS #================================================= From 0aee608443a7cb01ecfb00c926d55d0c7750b85c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Wed, 6 Dec 2023 10:23:42 +0100 Subject: [PATCH 4/4] Remove subdirs in manifest as it's not managed by core --- manifest.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index f57f9d7..3dd37ab 100644 --- a/manifest.toml +++ b/manifest.toml @@ -68,7 +68,6 @@ ram.runtime = "500M" dir = "/opt/yunohost/__APP__" owner = "__APP__:rwX" group = "__APP__:rX" - subdirs = ["installed", "logs"] [resources.data_dir] dir = "/home/yunohost.app/__APP__"