From 3647ff15e1cbe94f3309c14cfe2b862367fe4535 Mon Sep 17 00:00:00 2001 From: Pierre Geeraert Date: Mon, 16 Mar 2026 14:42:55 +0000 Subject: [PATCH 01/20] trying to trigger a new image --- django_testing/dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/django_testing/dockerfile b/django_testing/dockerfile index 036ca78..d379873 100644 --- a/django_testing/dockerfile +++ b/django_testing/dockerfile @@ -1,6 +1,8 @@ # Stage 1: Build the module FROM python:3 +MAINTAINER pi-ux-ce + ENV PYTHONUNBUFFERED 1 WORKDIR /code/ -- 2.54.0 From 97896b5170f18e7b612c984a34b2041d549b07fb Mon Sep 17 00:00:00 2001 From: Pierre Geeraert Date: Mon, 16 Mar 2026 14:50:49 +0000 Subject: [PATCH 02/20] changing the authorised URL --- django_code/django_code/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django_code/django_code/settings.py b/django_code/django_code/settings.py index 1f3e16a..9db1b0a 100644 --- a/django_code/django_code/settings.py +++ b/django_code/django_code/settings.py @@ -25,7 +25,7 @@ SECRET_KEY = 'django-insecure-71%)_#e#o9-dl2o^6mfud-*rw+4+8vy-nd*bzeier&(34ap-p9 # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = ['reverse.tryton.geeraert.eu','192.168.4.100','django.tryton.geeraert.eu','localhost'] +ALLOWED_HOSTS = ['django-testing.tryton.geeraert.eu'] # Application definition -- 2.54.0 From 2b866b32bbf5633ad0b78b80b42b3f7016ab1a72 Mon Sep 17 00:00:00 2001 From: Pierre Geeraert Date: Mon, 16 Mar 2026 17:50:55 +0000 Subject: [PATCH 03/20] enable redirect..tryton.geeraert.eu --- django_code/django_code/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django_code/django_code/settings.py b/django_code/django_code/settings.py index 9db1b0a..f8299b9 100644 --- a/django_code/django_code/settings.py +++ b/django_code/django_code/settings.py @@ -25,7 +25,7 @@ SECRET_KEY = 'django-insecure-71%)_#e#o9-dl2o^6mfud-*rw+4+8vy-nd*bzeier&(34ap-p9 # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = ['django-testing.tryton.geeraert.eu'] +ALLOWED_HOSTS = ['django-testing.tryton.geeraert.eu','redirect.tryton.geeraert.eu'] # Application definition -- 2.54.0 From f49a6066934d42fa13af7c89da4f8635547e4c27 Mon Sep 17 00:00:00 2001 From: Pierre Geeraert Date: Mon, 16 Mar 2026 18:13:52 +0000 Subject: [PATCH 04/20] trying this url conf --- django_code/django_code/hosts.py | 7 ++++ django_code/django_code/redirect_urls.py | 43 ++++++++++++++++++++++++ django_code/django_code/settings.py | 3 ++ 3 files changed, 53 insertions(+) create mode 100644 django_code/django_code/hosts.py create mode 100644 django_code/django_code/redirect_urls.py diff --git a/django_code/django_code/hosts.py b/django_code/django_code/hosts.py new file mode 100644 index 0000000..cb721ef --- /dev/null +++ b/django_code/django_code/hosts.py @@ -0,0 +1,7 @@ +from django_hosts import patterns, host + +host_patterns = patterns( + "path.to", + host(r"django-testing", "urls.py", name="django-testing"), + host(r"redirect", "redirect_urls.py", name="redirect"), +) diff --git a/django_code/django_code/redirect_urls.py b/django_code/django_code/redirect_urls.py new file mode 100644 index 0000000..935cf82 --- /dev/null +++ b/django_code/django_code/redirect_urls.py @@ -0,0 +1,43 @@ +""" +URL configuration for django_code project. + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/4.2/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: path('', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: path('', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.urls import include, path + 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) +""" +from django.contrib import admin +from django.urls import path +#from docker_connection import views, apps +from random_simpsons import apps as random_simpsons +from paperless_django import apps as paperless_django +from onenote import apps as onenote +from dashboard import apps as dashboardapp +from dashboard import views as dashboardview +from kubernetes_connection import apps as kubernetes_connection +from stash_management import apps as stashapp +from stash_management import views as stashview +from website_redirection import apps as website_redirectionapp + +urlpatterns = [ +# path('admin/', admin.site.urls), + +################### Redirect ################### + path('/hello/', website_redirectionapp.hello), + path('redirect/hello/', website_redirectionapp.hello), + path('redirect/set/', website_redirectionapp.redirect), + path('redirect/get/', website_redirectionapp.display_key), + path('redirect/go/', website_redirectionapp.redirect_to_key), + path('redirect/redirect-form/', website_redirectionapp.redirect_process, name='submit_form'), + path('redirect/clearkey/', website_redirectionapp.clearkey_process, name='submit_form'), + + +] diff --git a/django_code/django_code/settings.py b/django_code/django_code/settings.py index f8299b9..7b4e93f 100644 --- a/django_code/django_code/settings.py +++ b/django_code/django_code/settings.py @@ -38,9 +38,11 @@ INSTALLED_APPS = [ 'django.contrib.messages', 'django.contrib.staticfiles', 'bootstrap5', + 'django_hosts', ] MIDDLEWARE = [ + 'django_hosts.middleware.HostsRequestMiddleware', 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', @@ -48,6 +50,7 @@ MIDDLEWARE = [ 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', + 'django_hosts.middleware.HostsResponseMiddleware', ] ROOT_URLCONF = 'django_code.urls' -- 2.54.0 From 61e5966083db4b2487138b88356b4103f3660b06 Mon Sep 17 00:00:00 2001 From: Pierre Geeraert Date: Mon, 16 Mar 2026 18:18:46 +0000 Subject: [PATCH 05/20] missed requirements --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9988c8c..771aaba 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,4 +12,5 @@ watchdog celery redis lxml -requests \ No newline at end of file +requests +django-hosts -- 2.54.0 From f80cfbeba7ae5bcc74e9a47ccf469e764dc43558 Mon Sep 17 00:00:00 2001 From: Pierre Geeraert Date: Mon, 16 Mar 2026 18:24:15 +0000 Subject: [PATCH 06/20] adding required value --- django_code/django_code/urls.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/django_code/django_code/urls.py b/django_code/django_code/urls.py index 2bdd87f..c7baf6d 100644 --- a/django_code/django_code/urls.py +++ b/django_code/django_code/urls.py @@ -27,6 +27,9 @@ from stash_management import apps as stashapp from stash_management import views as stashview from website_redirection import apps as website_redirectionapp +ROOT_HOSTCONF = 'hosts.py' +DEFAULT_HOST - 'django-testing.tryton.geeraert.eu' + urlpatterns = [ # path('admin/', admin.site.urls), -- 2.54.0 From ce4a4838f1f6228bff3836f9732ee0826549960c Mon Sep 17 00:00:00 2001 From: Pierre Geeraert Date: Mon, 16 Mar 2026 18:26:03 +0000 Subject: [PATCH 07/20] adding required value --- django_code/django_code/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django_code/django_code/urls.py b/django_code/django_code/urls.py index c7baf6d..20ca537 100644 --- a/django_code/django_code/urls.py +++ b/django_code/django_code/urls.py @@ -28,7 +28,7 @@ from stash_management import views as stashview from website_redirection import apps as website_redirectionapp ROOT_HOSTCONF = 'hosts.py' -DEFAULT_HOST - 'django-testing.tryton.geeraert.eu' +DEFAULT_HOST = 'django-testing.tryton.geeraert.eu' urlpatterns = [ # path('admin/', admin.site.urls), -- 2.54.0 From 06024c82c146db87371fb5224f6837cebb93942f Mon Sep 17 00:00:00 2001 From: Pierre Geeraert Date: Mon, 16 Mar 2026 18:30:37 +0000 Subject: [PATCH 08/20] trying like that --- django_code/django_code/hosts.py | 5 +++-- django_code/django_code/settings.py | 3 +++ django_code/django_code/urls.py | 2 -- .../redirect_urls.py => website_redirection/urls.py} | 0 4 files changed, 6 insertions(+), 4 deletions(-) rename django_code/{django_code/redirect_urls.py => website_redirection/urls.py} (100%) diff --git a/django_code/django_code/hosts.py b/django_code/django_code/hosts.py index cb721ef..0d0587b 100644 --- a/django_code/django_code/hosts.py +++ b/django_code/django_code/hosts.py @@ -1,7 +1,8 @@ +from django.conf import settings from django_hosts import patterns, host host_patterns = patterns( "path.to", - host(r"django-testing", "urls.py", name="django-testing"), - host(r"redirect", "redirect_urls.py", name="redirect"), + host(r"django-testing", settings.ROOT_URLCONF, name="django-testing"), + host(r"redirect", 'website_redirectionapp.urls', name="redirect"), ) diff --git a/django_code/django_code/settings.py b/django_code/django_code/settings.py index 7b4e93f..6463743 100644 --- a/django_code/django_code/settings.py +++ b/django_code/django_code/settings.py @@ -54,6 +54,9 @@ MIDDLEWARE = [ ] ROOT_URLCONF = 'django_code.urls' +ROOT_HOSTCONF = 'django_code.hosts' +DEFAULT_HOST = 'django-tryton' + TEMPLATES = [ { diff --git a/django_code/django_code/urls.py b/django_code/django_code/urls.py index 20ca537..8b00ee6 100644 --- a/django_code/django_code/urls.py +++ b/django_code/django_code/urls.py @@ -27,8 +27,6 @@ from stash_management import apps as stashapp from stash_management import views as stashview from website_redirection import apps as website_redirectionapp -ROOT_HOSTCONF = 'hosts.py' -DEFAULT_HOST = 'django-testing.tryton.geeraert.eu' urlpatterns = [ # path('admin/', admin.site.urls), diff --git a/django_code/django_code/redirect_urls.py b/django_code/website_redirection/urls.py similarity index 100% rename from django_code/django_code/redirect_urls.py rename to django_code/website_redirection/urls.py -- 2.54.0 From b01145e6bdcb1dba7d2b78f21ba2b703a6c935fb Mon Sep 17 00:00:00 2001 From: Pierre Geeraert Date: Mon, 16 Mar 2026 18:33:22 +0000 Subject: [PATCH 09/20] adding nano --- django_testing/dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django_testing/dockerfile b/django_testing/dockerfile index d379873..0e16a3e 100644 --- a/django_testing/dockerfile +++ b/django_testing/dockerfile @@ -9,7 +9,7 @@ WORKDIR /code/ # Install build tools and MaxMind library RUN apt-get update && \ - apt-get install -y git && \ + apt-get install -y git nano && \ rm -rf /var/lib/apt/lists/* # Clone the specific GeoIP2 module project -- 2.54.0 From 33a9d6fec7af9fb341cdd02d381f020dd6c2ecd1 Mon Sep 17 00:00:00 2001 From: Pierre Geeraert Date: Mon, 16 Mar 2026 18:36:55 +0000 Subject: [PATCH 10/20] d --- django_code/django_code/hosts.py | 1 - django_code/django_code/settings.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/django_code/django_code/hosts.py b/django_code/django_code/hosts.py index 0d0587b..a1c02a7 100644 --- a/django_code/django_code/hosts.py +++ b/django_code/django_code/hosts.py @@ -2,7 +2,6 @@ from django.conf import settings from django_hosts import patterns, host host_patterns = patterns( - "path.to", host(r"django-testing", settings.ROOT_URLCONF, name="django-testing"), host(r"redirect", 'website_redirectionapp.urls', name="redirect"), ) diff --git a/django_code/django_code/settings.py b/django_code/django_code/settings.py index 6463743..b3291ad 100644 --- a/django_code/django_code/settings.py +++ b/django_code/django_code/settings.py @@ -55,7 +55,7 @@ MIDDLEWARE = [ ROOT_URLCONF = 'django_code.urls' ROOT_HOSTCONF = 'django_code.hosts' -DEFAULT_HOST = 'django-tryton' +DEFAULT_HOST = 'django-testing' TEMPLATES = [ -- 2.54.0 From e78825b99f920f28ac002b63dd9a432f65665bad Mon Sep 17 00:00:00 2001 From: pierre geeraert Date: Mon, 16 Mar 2026 19:57:06 +0000 Subject: [PATCH 11/20] importnt first argument --- django_code/django_code/hosts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django_code/django_code/hosts.py b/django_code/django_code/hosts.py index a1c02a7..ed527d6 100644 --- a/django_code/django_code/hosts.py +++ b/django_code/django_code/hosts.py @@ -1,7 +1,7 @@ from django.conf import settings from django_hosts import patterns, host -host_patterns = patterns( +host_patterns = patterns('', host(r"django-testing", settings.ROOT_URLCONF, name="django-testing"), host(r"redirect", 'website_redirectionapp.urls', name="redirect"), ) -- 2.54.0 From 6ff0bb31d36ee1ed35e3e1c691b955694d946d4a Mon Sep 17 00:00:00 2001 From: pierre geeraert Date: Mon, 16 Mar 2026 20:03:20 +0000 Subject: [PATCH 12/20] fix name of the module --- django_code/django_code/hosts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django_code/django_code/hosts.py b/django_code/django_code/hosts.py index ed527d6..aa923ed 100644 --- a/django_code/django_code/hosts.py +++ b/django_code/django_code/hosts.py @@ -3,5 +3,5 @@ from django_hosts import patterns, host host_patterns = patterns('', host(r"django-testing", settings.ROOT_URLCONF, name="django-testing"), - host(r"redirect", 'website_redirectionapp.urls', name="redirect"), + host(r"redirect", 'website_redirection.urls', name="redirect"), ) -- 2.54.0 From 76d0cbdb8deb32c3dfee36278ef0c6958e03f7d5 Mon Sep 17 00:00:00 2001 From: pierre geeraert Date: Mon, 16 Mar 2026 20:03:53 +0000 Subject: [PATCH 13/20] default url --- django_code/website_redirection/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django_code/website_redirection/urls.py b/django_code/website_redirection/urls.py index 935cf82..77613b7 100644 --- a/django_code/website_redirection/urls.py +++ b/django_code/website_redirection/urls.py @@ -31,7 +31,7 @@ urlpatterns = [ # path('admin/', admin.site.urls), ################### Redirect ################### - path('/hello/', website_redirectionapp.hello), + path('/', website_redirectionapp.hello), path('redirect/hello/', website_redirectionapp.hello), path('redirect/set/', website_redirectionapp.redirect), path('redirect/get/', website_redirectionapp.display_key), -- 2.54.0 From beba1f16b43bb14d9d1ed024e78f22593608b34b Mon Sep 17 00:00:00 2001 From: pierre geeraert Date: Mon, 16 Mar 2026 20:14:47 +0000 Subject: [PATCH 14/20] changing path --- django_code/website_redirection/urls.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/django_code/website_redirection/urls.py b/django_code/website_redirection/urls.py index 77613b7..84242d3 100644 --- a/django_code/website_redirection/urls.py +++ b/django_code/website_redirection/urls.py @@ -31,13 +31,14 @@ urlpatterns = [ # path('admin/', admin.site.urls), ################### Redirect ################### - path('/', website_redirectionapp.hello), - path('redirect/hello/', website_redirectionapp.hello), - path('redirect/set/', website_redirectionapp.redirect), - path('redirect/get/', website_redirectionapp.display_key), - path('redirect/go/', website_redirectionapp.redirect_to_key), - path('redirect/redirect-form/', website_redirectionapp.redirect_process, name='submit_form'), - path('redirect/clearkey/', website_redirectionapp.clearkey_process, name='submit_form'), + path('', website_redirectionapp.hello), + path('hello/', website_redirectionapp.hello), + path('set/', website_redirectionapp.redirect), + path('get/', website_redirectionapp.display_key), + path('go/', website_redirectionapp.redirect_to_key), + path('redirect-form/', website_redirectionapp.redirect_process, name='submit_form'), + path('clearkey/', website_redirectionapp.clearkey_process, name='submit_form'), + ] -- 2.54.0 From 8af976c528cdbcad7114ba3291e68a9f18a4d36f Mon Sep 17 00:00:00 2001 From: pierre geeraert Date: Mon, 16 Mar 2026 20:16:01 +0000 Subject: [PATCH 15/20] change path as well --- django_code/website_redirection/templates/redirect_form.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django_code/website_redirection/templates/redirect_form.html b/django_code/website_redirection/templates/redirect_form.html index d621809..364665a 100644 --- a/django_code/website_redirection/templates/redirect_form.html +++ b/django_code/website_redirection/templates/redirect_form.html @@ -259,7 +259,7 @@

Redirect Form

Download form

-
+