diff --git a/README.md b/README.md index 629b4eb..d1b51fb 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,8 @@ It shall NOT be edited by hand. # mygpo (gPodder.net) for YunoHost -[![Integration level](https://dash.yunohost.org/integration/mygpo.svg)](https://dash.yunohost.org/appci/app/mygpo) ![Working status](https://ci-apps.yunohost.org/ci/badges/mygpo.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/mygpo.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/mygpo.svg)](https://dash.yunohost.org/appci/app/mygpo) ![Working status](https://ci-apps.yunohost.org/ci/badges/mygpo.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/mygpo.maintain.svg) + [![Install mygpo (gPodder.net) with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mygpo) *[Lire ce readme en français.](./README_fr.md)* @@ -18,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in This is the webservice powering the https://gpodder.net website. It can be used to sync podcast subscriptions with [supported clients](https://gpoddernet.readthedocs.io/en/latest/user/clients.html). -**Shipped version:** 2.11.20220622~ynh2 +**Shipped version:** 2.11.20221222~ynh1 **Demo:** https://gpodder.net diff --git a/README_fr.md b/README_fr.md index 47e2e47..4e7c131 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,8 @@ It shall NOT be edited by hand. # mygpo (gPodder.net) pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/mygpo.svg)](https://dash.yunohost.org/appci/app/mygpo) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/mygpo.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/mygpo.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/mygpo.svg)](https://dash.yunohost.org/appci/app/mygpo) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/mygpo.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/mygpo.maintain.svg) + [![Installer mygpo (gPodder.net) avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mygpo) *[Read this readme in english.](./README.md)* @@ -18,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po This is the webservice powering the https://gpodder.net website. It can be used to sync podcast subscriptions with [supported clients](https://gpoddernet.readthedocs.io/en/latest/user/clients.html). -**Version incluse :** 2.11.20220622~ynh2 +**Version incluse :** 2.11.20221222~ynh1 **Démo :** https://gpodder.net diff --git a/conf/app.src b/conf/app.src index bd87588..bcd61a5 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/gpodder/mygpo/archive/60caf1adfb6c0dbeb21828a0d1ae0dfebc279abd.tar.gz -SOURCE_SUM=15076ba34b6a85f61923e78dd84ce93384daca92331f34d20333be4c3d915b08 +SOURCE_URL=https://github.com/gpodder/mygpo/archive/80c41dc0c9a58dc0e85f6ef56662cdfd0d6e3b16.tar.gz +SOURCE_SUM=cce51ef812e5a692ea38b82cb559a4982dcf76ad34d6adf73aff2c5299cb5573 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 72abf38..3c3a136 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Manage podcast subscriptions, and sync them between apps and devices", "fr": "Gérez vos sousciptions balado, et sychronisez-lez entre vos applis et appareils" }, - "version": "2.11.20220622~ynh2", + "version": "2.11.20221222~ynh1", "url": "https://github.com/gpodder/mygpo", "upstream": { "license": "AGPL-3.0-only", diff --git a/scripts/_common.sh b/scripts/_common.sh index c115d80..ffd8858 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # dependencies used by the app -pkg_dependencies="acl python3 python3-dev python3-pip python3-venv postgresql postgresql-contrib libpq-dev redis-server libldap2-dev libsasl2-dev" +pkg_dependencies="acl libffi-dev libjpeg-dev libwebp-dev python3 python3-dev python3-pip python3-venv postgresql postgresql-contrib libpq-dev redis-server libldap2-dev libsasl2-dev" #================================================= # PERSONAL HELPERS diff --git a/sources/patches/app-00-gunicorn.conf.py.patch b/sources/patches/app-00-gunicorn.conf.py.patch index 126ee3b..0ef5f62 100644 --- a/sources/patches/app-00-gunicorn.conf.py.patch +++ b/sources/patches/app-00-gunicorn.conf.py.patch @@ -1,25 +1,27 @@ diff --git a/conf/gunicorn.conf.py b/conf/gunicorn.conf.py -index 726cd5f4..c13809cc 100644 +index c5940616..28c84d79 100644 --- a/conf/gunicorn.conf.py +++ b/conf/gunicorn.conf.py -@@ -1,16 +1,16 @@ - import multiprocessing +@@ -1,17 +1,17 @@ + # import multiprocessing import os - + -bind = "unix:/tmp/mygpo.sock" +#bind = "unix:/tmp/mygpo.sock" #workers = multiprocessing.cpu_count() workers = 3 - + # The maximum number of requests a worker will process before restarting. # max_requests = 1000 - --errorlog = "/var/log/gunicorn/error.log" --accesslog = "/var/log/gunicorn/access.log" + +-log_dir = os.getenv("LOGGING_DIR_GUNICRON", "/var/log/gunicorn/") +-errorlog = log_dir + "error.log" +-accesslog = log_dir + "access.log" -loglevel = "info" -+#errorlog = "/var/log/gunicorn/error.log" -+#accesslog = "/var/log/gunicorn/access.log" ++#log_dir = os.getenv("LOGGING_DIR_GUNICRON", "/var/log/gunicorn/") ++#errorlog = log_dir + "error.log" ++#accesslog = log_dir + "access.log" +#loglevel = "info" access_log_format = '%(h)s %(l)s %(u)s %(t)s "%(r)s" %(s)s %(b)s %(T)s "%(f)s" "%(a)s"' - + timeout = 120