diff --git a/.gitea/workflows/dockerfile_runner.yaml b/.gitea/workflows/dockerfile_runner.yaml
index 6890e64..876514c 100644
--- a/.gitea/workflows/dockerfile_runner.yaml
+++ b/.gitea/workflows/dockerfile_runner.yaml
@@ -33,6 +33,8 @@ jobs:
- name: Check out repository code
uses: actions/checkout@v4
clean: false
+ fetch-depth: 1
+ ref: 'main'
# - name: Manually check out repository code
# run: cd ${{ gitea.workspace }} ; git pull origin main
@@ -81,6 +83,9 @@ jobs:
uses: docker/build-push-action@v6
with:
push: true
+ build-args: |
+ ALLOWED_HOSTS='django.tryton.geeraert.eu'
+ DEBUG='True'
tags: |
gitea.tryton.geeraert.eu/pi-ux-ce/django-python:latest
gitea.tryton.geeraert.eu/pi-ux-ce/django-python:${{ env.next_version }}
diff --git a/Django_webserver.kube.yaml b/Django_webserver.kube.yaml
deleted file mode 100644
index 5c81e49..0000000
--- a/Django_webserver.kube.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
- name: django-python
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: django-webserver
- namespace: django-python
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: django-python
- template:
- metadata:
- labels:
- app: django-python
- spec:
- containers:
- - name: django-python
- image: gitea.tryton.geeraert.eu/pi-ux-ce/django-python:latest
- imagePullPolicy: Always
- ports:
- - containerPort: 8000
- name: webserver-port
- volumeMounts:
-## - name: django-python-code
-# mountPath: /code
- - name: servarr-data
- mountPath: /data
- readOnly: true
- - name: secret-kubeconfig
- mountPath: /kubeconfig
-
-
- resources:
- limits:
- cpu: 100m
- memory: 200Mi
- volumes:
- - name: django-python-code
- persistentVolumeClaim:
- claimName: django-python-code
- - name: servarr-data
- hostPath:
- path: /data
- - name: secret-kubeconfig
- secret:
- defaultMode: 420
- secretName: kubeconfig
-
-
----
-apiVersion: v1
-kind: Service
-metadata:
- name: webserver
- namespace: django-python
-spec:
- ports:
- - name: http
- port: 8000
- protocol: TCP
- selector:
- app: django-python
diff --git a/django_code/django_code/settings.py b/django_code/django_code/settings.py
index c45e312..41d8fb5 100644
--- a/django_code/django_code/settings.py
+++ b/django_code/django_code/settings.py
@@ -23,7 +23,9 @@ BASE_DIR = Path(__file__).resolve().parent.parent
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 = os.getenv("DEBUG")
+#DEBUG = os.getenv("DEBUG")
+DEBUG = os.getenv("DEBUG", "False").lower() in ("true", "1", "t")
+
ALLOWED_HOSTS = os.getenv("ALLOWED_HOSTS").split(",")
diff --git a/django_code/website_redirection/apps.py b/django_code/website_redirection/apps.py
index ca51df8..bafcfac 100644
--- a/django_code/website_redirection/apps.py
+++ b/django_code/website_redirection/apps.py
@@ -41,8 +41,11 @@ def display_key(request,key):
def redirect_to_key(request,key):
value = r.get(key)
if value == None:
+ icon_url = r.get('icon')
+ if icon_url == None:
+ icon_url = "https://cdn-icons-png.flaticon.com/512/6402/6402576.png"
print(key+" is not setup, displaying default page")
- return render(request, 'blank_page.html',{})
+ return render(request, 'blank_page.html', {'title': key,'icon_url':icon_url})
else:
value_extracted = str(value.decode('utf-8'))
print(key+" is setup to : "+value_extracted)
diff --git a/django_code/website_redirection/templates/blank_page.html b/django_code/website_redirection/templates/blank_page.html
index a8f3ae9..5684b78 100644
--- a/django_code/website_redirection/templates/blank_page.html
+++ b/django_code/website_redirection/templates/blank_page.html
@@ -2,7 +2,7 @@
- Streaming
+ {{ title }}
diff --git a/django_code/website_redirection/templates/redirect_form.html b/django_code/website_redirection/templates/redirect_form.html
index 364665a..8546ce5 100644
--- a/django_code/website_redirection/templates/redirect_form.html
+++ b/django_code/website_redirection/templates/redirect_form.html
@@ -275,8 +275,17 @@
-
-
+
+
+
+
+
+
+
+
+
+
+