From 0306e7e62e81f1edd121428881460df9b66e2932 Mon Sep 17 00:00:00 2001 From: Navan Chauhan Date: Fri, 14 Jun 2024 00:30:54 -0600 Subject: [PATCH] Revert "Testing" --- ALL_README.md | 4 +-- README.md | 4 +-- README_es.md | 61 -------------------------------------------- README_eu.md | 61 -------------------------------------------- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 61 -------------------------------------------- check_process | 25 ++++++++++++++++++ conf/application.yml | 34 +++++++++++++++--------- conf/systemd.service | 2 +- manifest.toml | 16 ++++-------- scripts/change_url | 2 +- scripts/install | 10 -------- scripts/upgrade | 10 -------- 14 files changed, 59 insertions(+), 235 deletions(-) delete mode 100644 README_es.md delete mode 100644 README_eu.md delete mode 100644 README_zh_Hans.md create mode 100644 check_process diff --git a/ALL_README.md b/ALL_README.md index 152f2e7..3d6c579 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,8 +1,6 @@ # All available README files by language - [Read the README in English](README.md) -- [Lea el README en español](README_es.md) -- [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) -- [阅读中文（简体）的 README](README_zh_Hans.md) +- [Leggi il “README” in italiano](README_it.md) diff --git a/README.md b/README.md index c44a6db..7e2df55 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ It shall NOT be edited by hand. [![Install Komga with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=komga) -*[Read this README in other languages.](./ALL_README.md)* +*[Read this README is other languages.](./ALL_README.md)* > *This package allows you to install Komga quickly and simply on a YunoHost server.* > *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* @@ -30,7 +30,7 @@ Komga is a free and open source comics/mangas server. - Download book files -**Shipped version:** 1.11.1~ynh1 +**Shipped version:** 1.10.3~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md deleted file mode 100644 index f4afaca..0000000 --- a/README_es.md +++ /dev/null @@ -1,61 +0,0 @@ - - -# Komga para Yunohost - -[![Nivel de integración](https://dash.yunohost.org/integration/komga.svg)](https://dash.yunohost.org/appci/app/komga) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/komga.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/komga.maintain.svg) - -[![Instalar Komga con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=komga) - -*[Leer este README en otros idiomas.](./ALL_README.md)* - -> *Este paquete le permite instalarKomga rapidamente y simplement en un servidor YunoHost.* -> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.* - -## Descripción general - -Komga is a free and open source comics/mangas server. - -### Features - -- Browse libraries, series and books via a responsive web UI that works on desktop, tablets and phones -- Organize your library with collections and read lists -- Edit metadata for your series and books -- Import embedded metadata automatically -- Webreader with multiple reading modes -- Manage multiple users, with per-library access control -- Offers a REST API, many community tools and scripts can interact with Komga -- Download book files - - -**Versión actual:** 1.11.1~ynh1 - -**Demo:** - -## Capturas - -![Captura de Komga](./doc/screenshots/home.png) - -## Documentaciones y recursos - -- Sitio web oficial: -- Documentación administrador oficial: -- Repositorio del código fuente oficial de la aplicación : -- Catálogo YunoHost: -- Reportar un error: - -## Información para desarrolladores - -Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/komga_ynh/tree/testing - -Para probar la rama `testing`, sigue asÍ: - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/komga_ynh/tree/testing --debug -o -sudo yunohost app upgrade komga -u https://github.com/YunoHost-Apps/komga_ynh/tree/testing --debug -``` - -**Mas informaciones sobre el empaquetado de aplicaciones:** diff --git a/README_eu.md b/README_eu.md deleted file mode 100644 index c95f651..0000000 --- a/README_eu.md +++ /dev/null @@ -1,61 +0,0 @@ - - -# Komga YunoHost-erako - -[![Integrazio maila](https://dash.yunohost.org/integration/komga.svg)](https://dash.yunohost.org/appci/app/komga) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/komga.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/komga.maintain.svg) - -[![Instalatu Komga YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=komga) - -*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* - -> *Pakete honek Komga YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* -> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* - -## Aurreikuspena - -Komga is a free and open source comics/mangas server. - -### Features - -- Browse libraries, series and books via a responsive web UI that works on desktop, tablets and phones -- Organize your library with collections and read lists -- Edit metadata for your series and books -- Import embedded metadata automatically -- Webreader with multiple reading modes -- Manage multiple users, with per-library access control -- Offers a REST API, many community tools and scripts can interact with Komga -- Download book files - - -**Paketatutako bertsioa:** 1.11.1~ynh1 - -**Demoa:** - -## Pantaila-argazkiak - -![Komga(r)en pantaila-argazkia](./doc/screenshots/home.png) - -## Dokumentazioa eta baliabideak - -- Aplikazioaren webgune ofiziala: -- Administratzaileen dokumentazio ofiziala: -- Jatorrizko aplikazioaren kode-gordailua: -- YunoHost Denda: -- Eman errore baten berri: - -## Garatzaileentzako informazioa - -Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/komga_ynh/tree/testing). - -`testing` abarra probatzeko, ondorengoa egin: - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/komga_ynh/tree/testing --debug -edo -sudo yunohost app upgrade komga -u https://github.com/YunoHost-Apps/komga_ynh/tree/testing --debug -``` - -**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md index 3e9d03a..345404f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,7 @@ Komga est un serveur de bandes dessinées/mangas gratuit et open source. - Propose une API REST, de nombreux outils et scripts communautaires peuvent interagir avec Komga - Télécharger des fichiers de livres -**Version incluse :** 1.11.1~ynh1 +**Version incluse :** 1.10.3~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 2940808..2517af3 100644 --- a/README_gl.md +++ b/README_gl.md @@ -30,7 +30,7 @@ Komga is a free and open source comics/mangas server. - Download book files -**Versión proporcionada:** 1.11.1~ynh1 +**Versión proporcionada:** 1.10.3~ynh1 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md deleted file mode 100644 index bfa41b0..0000000 --- a/README_zh_Hans.md +++ /dev/null @@ -1,61 +0,0 @@ - - -# YunoHost 上的 Komga - -[![集成程度](https://dash.yunohost.org/integration/komga.svg)](https://dash.yunohost.org/appci/app/komga) ![工作状态](https://ci-apps.yunohost.org/ci/badges/komga.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/komga.maintain.svg) - -[![使用 YunoHost 安装 Komga](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=komga) - -*[阅读此 README 的其它语言版本。](./ALL_README.md)* - -> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Komga。* -> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* - -## 概况 - -Komga is a free and open source comics/mangas server. - -### Features - -- Browse libraries, series and books via a responsive web UI that works on desktop, tablets and phones -- Organize your library with collections and read lists -- Edit metadata for your series and books -- Import embedded metadata automatically -- Webreader with multiple reading modes -- Manage multiple users, with per-library access control -- Offers a REST API, many community tools and scripts can interact with Komga -- Download book files - - -**分发版本：** 1.11.1~ynh1 - -**演示：** - -## 截图 - -![Komga 的截图](./doc/screenshots/home.png) - -## 文档与资源 - -- 官方应用网站： -- 官方管理文档： -- 上游应用代码库： -- YunoHost 商店： -- 报告 bug： - -## 开发者信息 - -请向 [`testing` 分支](https://github.com/YunoHost-Apps/komga_ynh/tree/testing) 发送拉取请求。 - -如要尝试 `testing` 分支，请这样操作： - -```bash -sudo yunohost app install https://github.com/YunoHost-Apps/komga_ynh/tree/testing --debug -或 -sudo yunohost app upgrade komga -u https://github.com/YunoHost-Apps/komga_ynh/tree/testing --debug -``` - -**有关应用打包的更多信息：** diff --git a/check_process b/check_process new file mode 100644 index 0000000..7a9daac --- /dev/null +++ b/check_process @@ -0,0 +1,25 @@ +;; Test complet + ; Manifest + domain="domain.tld" + path="/path" + is_public=1 + port="8080" + ; Checks + pkg_linter=1 + setup_sub_dir=1 + setup_root=1 + setup_nourl=0 + setup_private=1 + setup_public=1 + upgrade=1 + backup_restore=1 + multi_instance=1 + change_url=1 +;;; Options +Email= +Notification=none +;;; Upgrade options + ; commit= + name= + manifest_arg=domain=DOMAIN&path=PATH&is_public=1&port=8080& + diff --git a/conf/application.yml b/conf/application.yml index fb38f86..43005f9 100644 --- a/conf/application.yml +++ b/conf/application.yml @@ -1,16 +1,26 @@ -# Only keep lines that are relevant to you! -# Lines starting with # are comments -# Make sure indentation is correct (2 spaces at every indentation level), yaml is very sensitive! komga: - config-dir: __DATA_DIR__/ + libraries-scan-cron: "* */15 * * * ?" #periodic scan every 15 minutes + libraries-scan-cron: "-" #disable periodic scan + libraries-scan-startup: false #scan libraries at startup + libraries-scan-directory-exclusions: #patterns to exclude directories from the scan + - "#recycle" #synology NAS recycle bin + - "@eaDir" #synology NAS index/metadata folders + remember-me: + key: changeMe! #required to activate the remember-me auto-login via cookies + validity: 2592000 #validity of the cookie in seconds, here 1 month database: - file: __DATA_DIR__/database.sqlite - cors.allowed-origins: - - http://127.0.0.1:__PORT__ - delete-empty-collections: true - delete-empty-read-lists: true + file: __DATA_DIR__/.komga/database.sqlite + database-backup: + path: ~/.komga/database-backup.zip + schedule: "0 0 */6 * * ?" #every 6 hours + enabled: true + startup: true server: port: __PORT__ - servlet: - session.timeout: 7d # session timeout, here 7 days - context-path: __PATH__/ + servlet.context-path: __PATH__/ +spring: + datasource: + url: jdbc:h2:/path/to/your/database.h2 #absolute path for Unix + url: jdbc:h2:D:\\komga\database.h2 #absolute path for Windows + url: jdbc:h2:~/.komga/database.h2 #relative path to user home directory + url: jdbc:h2:./komga/database.h2 #relative path to current directory diff --git a/conf/systemd.service b/conf/systemd.service index 48b638c..f9e5eca 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,7 +7,7 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=__INSTALL_DIR__/ -ExecStart=/usr/bin/java -jar -Xmx1g komga.jar --server.port=__PORT__ --server.servlet.context-path="__PATH__/" --komga.config-dir="__DATA_DIR__/" +ExecStart=/usr/bin/java -jar -Xmx1g komga.jar --server.port=__PORT__ --server.servlet.context-path="__PATH__" Restart=on-failure RestartSec=10 diff --git a/manifest.toml b/manifest.toml index b23b584..e5a52c9 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Komga" description.en = "Media server for your comics, manga and magazines" description.fr = "Serveur multimédia pour vos bandes dessinées, mangas et magazines" -version = "1.11.1~ynh1" +version = "1.10.3~ynh1" maintainers = ["Navan Chauhan"] @@ -43,8 +43,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/gotson/komga/releases/download/1.11.1/komga-1.11.1.jar" - sha256 = "2fa7dd47c8fad31d982f94b983a4c73752cbf9dcba9331e28e3351e3b2aeca5a" + url = "https://github.com/gotson/komga/releases/download/1.10.3/komga-1.10.3.jar" + sha256 = "b7f9f0a8456bb017842c92cbb62cc323bdfb56738346cb8f7d09670d405fa0a7" extract = false rename = "komga.jar" @@ -55,16 +55,10 @@ ram.runtime = "50M" [resources.install_dir] [resources.data_dir] + subdirs = [".komga"] [resources.permissions] main.url = "/" [resources.apt] - - packages_from_raw_bash = """ - if [[ $YNH_DEBIAN_VERSION == "bullseye" ]]; then - echo "openjdk-11-jre"; - elif [[ $YNH_DEBIAN_VERSION == "bookworm" ]]; then - echo "openjdk-17-jre"; - fi - """ + packages = "openjdk-17-jre-headless" diff --git a/scripts/change_url b/scripts/change_url index 20ac506..86e73e6 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -16,7 +16,7 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" +ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" #================================================= # MODIFY URL IN NGINX CONF diff --git a/scripts/install b/scripts/install index 8b80ac6..7d144e1 100755 --- a/scripts/install +++ b/scripts/install @@ -19,16 +19,6 @@ ynh_setup_source --dest_dir="$install_dir" chown -R $app:www-data "$install_dir" chmod +x $install_dir/komga.jar -#================================================= -# APP INITIAL CONFIGURATION -#================================================= -ynh_script_progression --message="Adding $app's configuration files..." --weight=1 - -ynh_add_config --template="application.yml" --destination="$data_dir/application.yml" - -chmod 400 "$data_dir/application.yml" -chown "$app:$app" "$data_dir/application.yml" - #================================================= # SYSTEM CONFIGURATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 4dee396..124f67c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -28,16 +28,6 @@ ynh_setup_source --dest_dir="$install_dir" chown -R $app:www-data "$install_dir" chmod +x $install_dir/komga.jar -#================================================= -# UPDATE A CONFIG FILE -#================================================= -ynh_script_progression --message="Updating $app's configuration files..." --weight=1 - -ynh_add_config --template="application.yml" --destination="$data_dir/application.yml" - -chmod 400 "$data_dir/application.yml" -chown "$app:$app" "$data_dir/application.yml" - #================================================= # REAPPLY SYSTEM CONFIGURATIONS #=================================================