From f334d6130dca7191cf0e8a2e1b1f4924654e0929 Mon Sep 17 00:00:00 2001 From: skyuk3000 <75224468+skyuk3000@users.noreply.github.com> Date: Tue, 4 Apr 2023 17:10:13 +0100 Subject: [PATCH 01/12] Update manifest.toml --- manifest.toml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/manifest.toml b/manifest.toml index 87449fa..e773bdd 100644 --- a/manifest.toml +++ b/manifest.toml @@ -40,6 +40,22 @@ ram.runtime = "50M" [resources.ports] main.default = 5000 + [resources.sources] + +[resources.sources.main] + in_subdir = false + amd64.url = "https://github.com/Kareadita/Kavita/releases/download/v0.7.1/kavita-linux-x64.tar.gz" + amd64.sha256 = "B67B91E97F490D0629AAD00E2B2E78752C57A2E7BDD00D3E1B1461EFEF5F22BA" + arm64.url = "https://github.com/Kareadita/Kavita/releases/download/v0.7.1/kavita-linux-arm64.tar.gz" + arm64.sha256 = "DEA4160C72B024BEB47565526DBD71512E8EEB65360D22E76A7E695C0A4C55B7" + armhf.url = "https://github.com/Kareadita/Kavita/releases/download/v0.7.1/kavita-linux-arm.tar.gz" + armhf.sha256 = "AD5CEC73D6B5B48386EAC5291CD9C4B40F0AF4FBB712E730518D3605E80F1D52" + + autoupdate.strategy = "latest_github_release" + autoupdate.asset.amd64 = ".*\amd64.tar.gz" + autoupdate.asset.arm64 = ".*\arm64.tar.gz" + autoupdate.asset.armhf = ".*\arm.tar.gz" + [resources.system_user] [resources.install_dir] From 1517799f435b70b6be47e046038920a838445062 Mon Sep 17 00:00:00 2001 From: skyuk3000 <75224468+skyuk3000@users.noreply.github.com> Date: Tue, 4 Apr 2023 17:13:18 +0100 Subject: [PATCH 02/12] Delete amd64.src --- conf/amd64.src | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 conf/amd64.src diff --git a/conf/amd64.src b/conf/amd64.src deleted file mode 100644 index 55d8941..0000000 --- a/conf/amd64.src +++ /dev/null @@ -1,7 +0,0 @@ -SOURCE_URL=https://github.com/Kareadita/Kavita/releases/download/v0.7.1/kavita-linux-x64.tar.gz -SOURCE_SUM=B67B91E97F490D0629AAD00E2B2E78752C57A2E7BDD00D3E1B1461EFEF5F22BA -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= -SOURCE_EXTRACT=true From c00151909e2a39996f4dc4eeb2836568ec0afb78 Mon Sep 17 00:00:00 2001 From: skyuk3000 <75224468+skyuk3000@users.noreply.github.com> Date: Tue, 4 Apr 2023 17:13:24 +0100 Subject: [PATCH 03/12] Delete arm64.src --- conf/arm64.src | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 conf/arm64.src diff --git a/conf/arm64.src b/conf/arm64.src deleted file mode 100644 index 8dec346..0000000 --- a/conf/arm64.src +++ /dev/null @@ -1,7 +0,0 @@ -SOURCE_URL=https://github.com/Kareadita/Kavita/releases/download/v0.7.1/kavita-linux-arm64.tar.gz -SOURCE_SUM=DEA4160C72B024BEB47565526DBD71512E8EEB65360D22E76A7E695C0A4C55B7 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= -SOURCE_EXTRACT=true From 122ed3d34f229f96827da16a658b0a92c5e392e3 Mon Sep 17 00:00:00 2001 From: skyuk3000 <75224468+skyuk3000@users.noreply.github.com> Date: Tue, 4 Apr 2023 17:13:32 +0100 Subject: [PATCH 04/12] Delete armhf.src --- conf/armhf.src | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 conf/armhf.src diff --git a/conf/armhf.src b/conf/armhf.src deleted file mode 100644 index a76a26f..0000000 --- a/conf/armhf.src +++ /dev/null @@ -1,7 +0,0 @@ -SOURCE_URL=https://github.com/Kareadita/Kavita/releases/download/v0.7.1/kavita-linux-arm.tar.gz -SOURCE_SUM=AD5CEC73D6B5B48386EAC5291CD9C4B40F0AF4FBB712E730518D3605E80F1D52 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= -SOURCE_EXTRACT=true From a81c71485b65967311656ff15eb2ed06cef78585 Mon Sep 17 00:00:00 2001 From: skyuk3000 <75224468+skyuk3000@users.noreply.github.com> Date: Tue, 4 Apr 2023 17:15:18 +0100 Subject: [PATCH 05/12] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index e9546b7..b6703d2 100755 --- a/scripts/install +++ b/scripts/install @@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Setting up source files..." --weight=1 +ynh_script_progression --message="Setting up source files..." --weight=4 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" --source_id=$YNH_ARCH From 846f8b24dc87d263c242b1f41318fc8e6e31285d Mon Sep 17 00:00:00 2001 From: skyuk3000 <75224468+skyuk3000@users.noreply.github.com> Date: Tue, 4 Apr 2023 17:19:39 +0100 Subject: [PATCH 06/12] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index e773bdd..a054e45 100644 --- a/manifest.toml +++ b/manifest.toml @@ -52,9 +52,9 @@ ram.runtime = "50M" armhf.sha256 = "AD5CEC73D6B5B48386EAC5291CD9C4B40F0AF4FBB712E730518D3605E80F1D52" autoupdate.strategy = "latest_github_release" - autoupdate.asset.amd64 = ".*\amd64.tar.gz" - autoupdate.asset.arm64 = ".*\arm64.tar.gz" - autoupdate.asset.armhf = ".*\arm.tar.gz" + autoupdate.asset.amd64 = ".*\.amd64.tar.gz" + autoupdate.asset.arm64 = ".*\.arm64.tar.gz" + autoupdate.asset.armhf = ".*\.arm.tar.gz" [resources.system_user] From c8e2311fbe6c019b7c88ad82f8768055e14ab053 Mon Sep 17 00:00:00 2001 From: skyuk3000 <75224468+skyuk3000@users.noreply.github.com> Date: Tue, 23 May 2023 13:40:14 +0100 Subject: [PATCH 07/12] 0.7.2~ynh1 --- manifest.toml | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/manifest.toml b/manifest.toml index a054e45..fdd1daa 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Kavita" description.en = "Media server for your comics, manga and books" description.fr = "Serveur multimédia pour vos bandes dessinées, mangas et livres" -version = "0.7.1~ynh1" +version = "0.7.2~ynh1" maintainers = ["eric_G"] @@ -19,7 +19,7 @@ code = "https://github.com/Kareadita/Kavita" [integration] yunohost = ">= 11.1.11" architectures = ["amd64", "arm64", "armhf"] -multi_instance = false +multi_instance = true ldap = false sso = false disk = "50M" @@ -28,9 +28,11 @@ ram.runtime = "50M" [install] [install.domain] - type = "domain" - full_domain = true + + [install.path] + type = "path" + default = "/kavita/" [install.init_main_permission] type = "group" @@ -40,21 +42,20 @@ ram.runtime = "50M" [resources.ports] main.default = 5000 - [resources.sources] +[resources.sources] + [resources.sources.main] + in_subdir = true + amd64.url = "https://github.com/Kareadita/Kavita/releases/download/v0.7.2/kavita-linux-x64.tar.gz" + amd64.sha256 = "d4bc73321e1241a1e6247fc0c5ff14504e73c5b3ce9c22a237fd6eae7fc51f33" + arm64.url = "https://github.com/Kareadita/Kavita/releases/download/v0.7.2/kavita-linux-arm64.tar.gz" + arm64.sha256 = "634d8b1be654de18ac0238512b9e552e9ad2dd50e6113199907fce525f71f14c" + armhf.url = "https://github.com/Kareadita/Kavita/releases/download/v0.7.2/kavita-linux-arm.tar.gz" + armhf.sha256 = "3bf7aac85f51432c8cc0a46ea885bb0167b03e9c0209858a76b1785f884cf104" -[resources.sources.main] - in_subdir = false - amd64.url = "https://github.com/Kareadita/Kavita/releases/download/v0.7.1/kavita-linux-x64.tar.gz" - amd64.sha256 = "B67B91E97F490D0629AAD00E2B2E78752C57A2E7BDD00D3E1B1461EFEF5F22BA" - arm64.url = "https://github.com/Kareadita/Kavita/releases/download/v0.7.1/kavita-linux-arm64.tar.gz" - arm64.sha256 = "DEA4160C72B024BEB47565526DBD71512E8EEB65360D22E76A7E695C0A4C55B7" - armhf.url = "https://github.com/Kareadita/Kavita/releases/download/v0.7.1/kavita-linux-arm.tar.gz" - armhf.sha256 = "AD5CEC73D6B5B48386EAC5291CD9C4B40F0AF4FBB712E730518D3605E80F1D52" - - autoupdate.strategy = "latest_github_release" - autoupdate.asset.amd64 = ".*\.amd64.tar.gz" - autoupdate.asset.arm64 = ".*\.arm64.tar.gz" - autoupdate.asset.armhf = ".*\.arm.tar.gz" + #autoupdate.strategy = "latest_github_release" + #autoupdate.asset.amd64 = ".*\.amd64.tar.gz" + #autoupdate.asset.arm64 = ".*\.arm64.tar.gz" + #autoupdate.asset.armhf = ".*\.arm.tar.gz" [resources.system_user] @@ -63,10 +64,11 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" - api.url = "/api" + api.url = "/api/*" api.show_tile = false api.protected= true api.allowed = ["visitors", "all_users"] + api.auth_header = false hubs.url = "/hubs/*" hubs.show_tile = false From 33d982ce96f23ab9a6e78a369ca38dd6b4611593 Mon Sep 17 00:00:00 2001 From: skyuk3000 <75224468+skyuk3000@users.noreply.github.com> Date: Tue, 23 May 2023 13:40:50 +0100 Subject: [PATCH 08/12] Create appsettings.json.example --- conf/appsettings.json.example | 6 ++++++ 1 file changed, 6 insertions(+) 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__" +} From abdef8e1a4fda2b1474aa493960eaaca5aba91ce Mon Sep 17 00:00:00 2001 From: skyuk3000 <75224468+skyuk3000@users.noreply.github.com> Date: Tue, 23 May 2023 13:41:19 +0100 Subject: [PATCH 09/12] 0.7.2~ynh1 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7b60022..9bcf8c7 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Kavita is a fast, feature rich, cross platform reading server. Built with a focu - OPDS-PS Support -**Shipped version:** 0.7.1~ynh1 +**Shipped version:** 0.7.2~ynh1 **Demo:** https://demo.kavitareader.com/ From a75153d69ba189667b76d780030f2a1262a421fd Mon Sep 17 00:00:00 2001 From: skyuk3000 <75224468+skyuk3000@users.noreply.github.com> Date: Tue, 23 May 2023 13:42:05 +0100 Subject: [PATCH 10/12] 0.7.2~ynh1 --- scripts/upgrade | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 9ee4448..6cb3fc5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -33,7 +33,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --source_id=$YNH_ARCH --keep="config" + ynh_setup_source --dest_dir="$install_dir" --keep="config" fi chmod 750 "$install_dir" @@ -41,6 +41,16 @@ 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 #================================================= From 4b32b5ac04af30d880288aaa6e551a366ed56787 Mon Sep 17 00:00:00 2001 From: skyuk3000 <75224468+skyuk3000@users.noreply.github.com> Date: Tue, 23 May 2023 13:42:34 +0100 Subject: [PATCH 11/12] 0.7.2~ynh1 --- scripts/install | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index b6703d2..bf2eb88 100755 --- a/scripts/install +++ b/scripts/install @@ -15,7 +15,7 @@ source /usr/share/yunohost/helpers ynh_script_progression --message="Setting up source files..." --weight=4 # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir="$install_dir" --source_id=$YNH_ARCH +ynh_setup_source --dest_dir="$install_dir" #--source_id=$YNH_ARCH chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" @@ -35,6 +35,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 #================================================= From 5e85c1a344d80dc6fbfaedcb5d7b0380c44b2797 Mon Sep 17 00:00:00 2001 From: skyuk3000 <75224468+skyuk3000@users.noreply.github.com> Date: Tue, 23 May 2023 13:43:36 +0100 Subject: [PATCH 12/12] 0.7.2~ynh1 --- scripts/change_url | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index ab2d658..33bbb1a 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -5,9 +5,18 @@ #================================================= # IMPORT GENERIC HELPERS #================================================= - +source _common.sh source /usr/share/yunohost/helpers +#================================================= +# STANDARD MODIFICATIONS +#================================================= +# STOP SYSTEMD SERVICE +#================================================= +ynh_script_progression --message="Stopping a systemd service..." --weight=1 + +ynh_systemd_action --service_name=$app --action=stop --log_path=systemd + #================================================= # MODIFY URL IN NGINX CONF #================================================= @@ -15,8 +24,32 @@ 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 +#================================================= +# START SYSTEMD SERVICE +#================================================= +ynh_script_progression --message="Starting a systemd service..." --weight=1 + +# Start a systemd service +ynh_systemd_action --service_name=$app --action=start + #================================================= # END OF SCRIPT #================================================= - ynh_script_progression --message="Change of URL completed for $app" --last