From 701d21e944963660d79ba5fdfcc29dc369fe6ae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 23 May 2023 15:11:05 +0200 Subject: [PATCH] cleaning --- conf/appsettings.json.example | 6 ++++++ manifest.toml | 2 +- scripts/change_url | 15 +++++++++++++++ scripts/install | 11 +++++++++++ scripts/upgrade | 11 +++++++++++ tests.toml | 1 - 6 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 conf/appsettings.json.example diff --git a/conf/appsettings.json.example b/conf/appsettings.json.example new file mode 100644 index 0000000..76e8940 --- /dev/null +++ b/conf/appsettings.json.example @@ -0,0 +1,6 @@ +{ + "TokenKey": "super secret unguessable key", + "Port": __PORT__, + "IpAddresses": "", + "BaseUrl": "__URL_PATH__" +} diff --git a/manifest.toml b/manifest.toml index 277e5dd..b2f5f4c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -19,7 +19,7 @@ code = "https://github.com/Kareadita/Kavita" [integration] yunohost = ">= 11.1.19" architectures = ["amd64", "arm64", "armhf"] -multi_instance = false +multi_instance = true ldap = false sso = false disk = "50M" diff --git a/scripts/change_url b/scripts/change_url index ae914ad..289d619 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -25,6 +25,21 @@ ynh_script_progression --message="Updating NGINX web server configuration..." -- ynh_change_url_nginx_config +#================================================= +# SPECIFIC MODIFICATIONS +#================================================= +# CONFIGURE Kavita +#================================================= +ynh_backup_if_checksum_is_different --file="$install_dir/config/appsettings.json" + +domain=$new_domain +url_path=${new_path#/} + +ynh_add_config --template="../conf/appsettings.json.example" --destination="$install_dir/config/appsettings.json" + +chmod 400 "$install_dir/config/appsettings.json" +chown $app:$app "$install_dir/config/appsettings.json" + #================================================= # GENERIC FINALISATION #================================================= diff --git a/scripts/install b/scripts/install index 70ad71d..90b967a 100755 --- a/scripts/install +++ b/scripts/install @@ -34,6 +34,17 @@ ynh_add_systemd_config yunohost service add $app --description="Cross platform reading server" --log="/var/log/$app/$app.log" +#================================================= +# MODIFY A CONFIG FILE +#================================================= +ynh_script_progression --message="Modifying a config file..." --weight=1 + +url_path=${path#/} +ynh_add_config --template="../conf/appsettings.json.example" --destination="$install_dir/config/appsettings.json" + +chmod 600 "$install_dir/config/appsettings.json" +chown $app:$app "$install_dir/config/appsettings.json" + #================================================= # START SYSTEMD SERVICE #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index e649072..7a1d884 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -40,6 +40,17 @@ chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" chmod +x $install_dir/Kavita +#================================================= +# MODIFY A CONFIG FILE +#================================================= +ynh_script_progression --message="Modifying a config file..." --weight=1 + +url_path=${path#/} +ynh_add_config --template="../conf/appsettings.json.example" --destination="$install_dir/config/appsettings.json" + +chmod 600 "$install_dir/config/appsettings.json" +chown $app:$app "$install_dir/config/appsettings.json" + #================================================= # REAPPLY SYSTEM CONFIGURATIONS #================================================= diff --git a/tests.toml b/tests.toml index fc80bad..210a497 100644 --- a/tests.toml +++ b/tests.toml @@ -6,7 +6,6 @@ test_format = 1.0 # Default args to use for install # ------------------------------- - # ------------------------------- # Commits to test upgrade from # ------------------------------- \ No newline at end of file