diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..91e90e1 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,8 @@ +{ + "markdownlint.config": { + "MD028": false, + "MD025": { + "front_matter_title": "" + } + } +} \ No newline at end of file diff --git a/README.md b/README.md index ad8fd93..624a819 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ 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:** 2021-05-19 +**Shipped version:** 2021-10-20 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 7801cf0..b700884 100644 --- a/README_fr.md +++ b/README_fr.md @@ -3,7 +3,7 @@ [![Niveau d'intégration](https://dash.yunohost.org/integration/mygpo.svg)](https://dash.yunohost.org/appci/app/mygpo) ![](https://ci-apps.yunohost.org/ci/badges/mygpo.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mygpo.maintain.svg) [![Installer mygpo 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)* +*[Read this readme in english.](./README.md)* > *Ce package vous permet d'installer mygpo rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.* @@ -12,7 +12,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install Ceci est le service derrière https://gpodder.net. Il peut servir pour synchronizer vos flux balado entre [clients compatibles](https://gpoddernet.readthedocs.io/en/latest/user/clients.html). -**Version incluse :** 2021-05-19 +**Version incluse :** 2021-10-20 ## Captures d'écran @@ -24,11 +24,11 @@ Ceci est le service derrière https://gpodder.net. Il peut servir pour synchroni ## Configuration -Modifiez les fichiers sous `/opt/yunohost/APPDIR/envs/prod` pour configurer les variables d'environment. Il y a une interface admin `a `votre-domaine.tld/admin` (seulement accessible par l'adminsitrateur). +Modifiez les fichiers sous `/opt/yunohost/APPDIR/envs/prod` pour configurer les variables d'environment. Il y a une interface admin a `votre-domaine.tld/admin` (seulement accessible par l'administrateur). ## Documentation - * Documentation officielle : https://gpoddernet.readthedocs.io/ +* Documentation officielle : https://gpoddernet.readthedocs.io/ #### Support multi-utilisateur diff --git a/conf/app.src b/conf/app.src index 3a1470a..147bbad 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/gpodder/mygpo/tarball/b6a68527370e0c62bfa08d022611a3ad8a7331a -SOURCE_SUM=71277581a3c7fa8d1cad32347b90b8cd9d82b9bb27573adb533ea59ec75f1ddc +SOURCE_URL=https://github.com/gpodder/mygpo/tarball/57579ae579a5499542d6fbd271f1e0ada7850f13 +SOURCE_SUM=66b0c72318296c8238cb6f7ed2564806b22605c56c368a7b45528ba3fabe48d3 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=b6a68527370e0c62bfa08d022611a3ad8a7331a +SOURCE_FILENAME=57579ae579a5499542d6fbd271f1e0ada7850f13 SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index 75e3dad..efb2f06 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.20210519~ynh1", + "version": "2.11.20211020~ynh1", "url": "https://github.com/gpodder/mygpo", "license": "AGPL-3.0-only", "maintainer": { diff --git a/scripts/_common.sh b/scripts/_common.sh index 939d59a..1e7e702 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -59,7 +59,7 @@ function upgrade_db { } function perform_db_migrations { - sudo -u $app $final_path/venv/bin/envdir $env_path $final_path/venv/bin/python $final_path/manage.py makemigrations + sudo -u $app $final_path/venv/bin/envdir $env_path $final_path/venv/bin/python $final_path/manage.py makemigrations --merge sudo -u $app $final_path/venv/bin/envdir $env_path $final_path/venv/bin/python $final_path/manage.py migrate } diff --git a/sources/patches/app-00-gunicorn.conf.py.patch b/sources/patches/app-00-gunicorn.conf.py.patch index 6f53e8b..126ee3b 100644 --- a/sources/patches/app-00-gunicorn.conf.py.patch +++ b/sources/patches/app-00-gunicorn.conf.py.patch @@ -1,13 +1,15 @@ diff --git a/conf/gunicorn.conf.py b/conf/gunicorn.conf.py -index c72ebeeb..cf0d5a3a 100644 +index 726cd5f4..c13809cc 100644 --- a/conf/gunicorn.conf.py +++ b/conf/gunicorn.conf.py -@@ -1,15 +1,11 @@ +@@ -1,16 +1,16 @@ import multiprocessing import os -bind = "unix:/tmp/mygpo.sock" - workers = multiprocessing.cpu_count() ++#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 @@ -15,6 +17,9 @@ index c72ebeeb..cf0d5a3a 100644 -errorlog = "/var/log/gunicorn/error.log" -accesslog = "/var/log/gunicorn/access.log" -loglevel = "info" ++#errorlog = "/var/log/gunicorn/error.log" ++#accesslog = "/var/log/gunicorn/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 - graceful_timeout = 60 diff --git a/sources/patches/app-01-settings.py.patch b/sources/patches/app-01-settings.py.patch index 4b14e81..7069138 100644 --- a/sources/patches/app-01-settings.py.patch +++ b/sources/patches/app-01-settings.py.patch @@ -1,5 +1,5 @@ diff --git a/mygpo/settings.py b/mygpo/settings.py -index 33bd283f..2666ade6 100644 +index b3927315..f295c326 100644 --- a/mygpo/settings.py +++ b/mygpo/settings.py @@ -2,6 +2,7 @@ import re @@ -26,4 +26,4 @@ index 33bd283f..2666ade6 100644 SESSION_ENGINE = "django.contrib.sessions.backends.cached_db" # TODO: use (default) JSON serializer for security - \ No newline at end of file +