From 5c3e3f1dc7702739069fa195a8b1ab7b7aa1116f Mon Sep 17 00:00:00 2001 From: Jens Diemer Date: Mon, 3 Apr 2023 10:26:28 +0200 Subject: [PATCH 1/9] +systemctl status django-for-runners --- doc/DISCLAIMER.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 37384f3..8b2ab88 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -122,6 +122,7 @@ root@yunohost:~# tail -f /var/log/django-for-runners/django-for-runners.log root@yunohost:~# cat /etc/systemd/system/django-for-runners.service root@yunohost:~# systemctl reload-or-restart django-for-runners +root@yunohost:~# systemctl status django-for-runners root@yunohost:~# journalctl --unit=for_runners --follow ``` From 65659665191df9c9f4dab0526494a4eadf9729e1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 3 Apr 2023 08:26:46 +0000 Subject: [PATCH 2/9] Auto-update README --- README.md | 1 + README_fr.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index 3da9e0d..8765f4c 100644 --- a/README.md +++ b/README.md @@ -168,6 +168,7 @@ root@yunohost:~# tail -f /var/log/django-for-runners/django-for-runners.log root@yunohost:~# cat /etc/systemd/system/django-for-runners.service root@yunohost:~# systemctl reload-or-restart django-for-runners +root@yunohost:~# systemctl status django-for-runners root@yunohost:~# journalctl --unit=for_runners --follow ``` diff --git a/README_fr.md b/README_fr.md index 340c5b8..a2527d5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -168,6 +168,7 @@ root@yunohost:~# tail -f /var/log/django-for-runners/django-for-runners.log root@yunohost:~# cat /etc/systemd/system/django-for-runners.service root@yunohost:~# systemctl reload-or-restart django-for-runners +root@yunohost:~# systemctl status django-for-runners root@yunohost:~# journalctl --unit=for_runners --follow ``` From a405ae324e42482dd9394a051192687ef1a811cd Mon Sep 17 00:00:00 2001 From: Jens Diemer Date: Mon, 3 Apr 2023 15:48:22 +0200 Subject: [PATCH 3/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8765f4c..3d4f6ff 100644 --- a/README.md +++ b/README.md @@ -169,7 +169,7 @@ root@yunohost:~# cat /etc/systemd/system/django-for-runners.service root@yunohost:~# systemctl reload-or-restart django-for-runners root@yunohost:~# systemctl status django-for-runners -root@yunohost:~# journalctl --unit=for_runners --follow +root@yunohost:~# journalctl --unit=django-for-runners --follow ``` ## local test From c2a21f3c92b4f925dab0494be4d877a4a771fe67 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 3 Apr 2023 13:48:26 +0000 Subject: [PATCH 4/9] Auto-update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3d4f6ff..8765f4c 100644 --- a/README.md +++ b/README.md @@ -169,7 +169,7 @@ root@yunohost:~# cat /etc/systemd/system/django-for-runners.service root@yunohost:~# systemctl reload-or-restart django-for-runners root@yunohost:~# systemctl status django-for-runners -root@yunohost:~# journalctl --unit=django-for-runners --follow +root@yunohost:~# journalctl --unit=for_runners --follow ``` ## local test From 3e571cff3d5f63f7c16949f17c35bdb525b40237 Mon Sep 17 00:00:00 2001 From: Jens Diemer Date: Mon, 3 Apr 2023 15:59:13 +0200 Subject: [PATCH 5/9] Bugfix serve media files `admin.site.urls` must be the last pattern! --- conf/urls.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/urls.py b/conf/urls.py index a0d3dae..0fa3469 100644 --- a/conf/urls.py +++ b/conf/urls.py @@ -9,10 +9,11 @@ if settings.PATH_URL: # settings.PATH_URL is the $YNH_APP_ARG_PATH # Prefix all urls with "PATH_URL": urlpatterns = [ - path(f'{settings.PATH_URL}/', admin.site.urls), path(f'{settings.PATH_URL}/media//', UserMediaView.as_view()), # TODO: https://github.com/jedie/django-for-runners/issues/25 # path(settings.MEDIA_URL.lstrip('/'), include('django_tools.serve_media_app.urls')), + + path(f'{settings.PATH_URL}/', admin.site.urls), ] else: # Installed to domain root, without a path prefix From ec5426c17c590743c36948f828a2d1dc86c5b561 Mon Sep 17 00:00:00 2001 From: Jens Diemer Date: Mon, 3 Apr 2023 15:59:33 +0200 Subject: [PATCH 6/9] Set log level by DEBUG / LOG_LEVEL for all loggers --- conf/settings.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/settings.py b/conf/settings.py index efcdcf3..5dd8ea9 100644 --- a/conf/settings.py +++ b/conf/settings.py @@ -159,9 +159,10 @@ LOGGING['handlers']['log_file']['filename'] = str(LOG_FILE) # Example how to add logging to own app: LOGGING['loggers']['for_runners'] = { 'handlers': ['syslog', 'log_file', 'mail_admins'], - 'level': 'INFO', 'propagate': False, } +for __logger_name in LOGGING['loggers'].keys(): + LOGGING['loggers'][__logger_name]['level'] = 'DEBUG' if DEBUG else LOG_LEVEL # ----------------------------------------------------------------------------- From a8a58c677d8bf90c8fb33ee5bbef740c8cf6b026 Mon Sep 17 00:00:00 2001 From: Jens Diemer Date: Mon, 3 Apr 2023 16:00:10 +0200 Subject: [PATCH 7/9] Release as 0.17.3~ynh2 --- manifest.json | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 49de205..c7088ea 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,7 @@ "description": { "en": "Store your GPX tracks of your running (or other sports activity)" }, - "version": "0.17.3~ynh1", + "version": "0.17.3~ynh2", "url": "https://github.com/jedie/django-for-runners", "upstream": { "license": "GPL-3.0", diff --git a/pyproject.toml b/pyproject.toml index 8ab1dfd..3b89557 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "for_runners_ynh" -version = "0.17.3+ynh1" +version = "0.17.3+ynh2" description = "YunoHost app package for https://github.com/jedie/django-for-runners" authors = ["Jens Diemer "] homepage = "https://github.com/YunoHost-Apps/django-for-runners_ynh" From dbde4ebf9872539152284c8ec33632ec21e27f8a Mon Sep 17 00:00:00 2001 From: Jens Diemer Date: Mon, 3 Apr 2023 16:00:41 +0200 Subject: [PATCH 8/9] fix code style --- conf/urls.py | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/urls.py b/conf/urls.py index 0fa3469..8ab031b 100644 --- a/conf/urls.py +++ b/conf/urls.py @@ -12,7 +12,6 @@ if settings.PATH_URL: path(f'{settings.PATH_URL}/media//', UserMediaView.as_view()), # TODO: https://github.com/jedie/django-for-runners/issues/25 # path(settings.MEDIA_URL.lstrip('/'), include('django_tools.serve_media_app.urls')), - path(f'{settings.PATH_URL}/', admin.site.urls), ] else: From 5c65ab35639c8796986f5675dc02826461568fb7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 3 Apr 2023 14:00:49 +0000 Subject: [PATCH 9/9] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8765f4c..2a0ce1b 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ This package for YunoHost used [django-yunohost-integration](https://github.com/ More screenshots are here: [jedie.github.io/tree/master/screenshots/django-for-runners](https://github.com/jedie/jedie.github.io/tree/master/screenshots/django-for-runners/README.creole) -**Shipped version:** 0.17.3~ynh1 +**Shipped version:** 0.17.3~ynh2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index a2527d5..9b5bc86 100644 --- a/README_fr.md +++ b/README_fr.md @@ -34,7 +34,7 @@ This package for YunoHost used [django-yunohost-integration](https://github.com/ More screenshots are here: [jedie.github.io/tree/master/screenshots/django-for-runners](https://github.com/jedie/jedie.github.io/tree/master/screenshots/django-for-runners/README.creole) -**Version incluse :** 0.17.3~ynh1 +**Version incluse :** 0.17.3~ynh2 ## Captures d’écran