From 2b4d84b994b6a4402ec552868036d164c54f03a0 Mon Sep 17 00:00:00 2001
From: SDKHISSI <admin.sdkhissi@SANCLP0031.ad.ponet>
Date: Mon, 27 Jan 2025 10:06:32 +0100
Subject: [PATCH 1/2] Failed to find another solution at this point, will
 probably only use groups given certificates for https

---
 .gitignore   |  4 +++-
 template.yml | 44 ++++++++++++--------------------------------
 2 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6663ac26..443f4514 100755
--- a/.gitignore
+++ b/.gitignore
@@ -56,4 +56,6 @@ symfony copy.lock
 
 
 test.yml
-.dockerignore
\ No newline at end of file
+.dockerignore
+*.pem
+*.key
\ No newline at end of file
diff --git a/template.yml b/template.yml
index 22e50b90..b0d2a026 100755
--- a/template.yml
+++ b/template.yml
@@ -180,13 +180,6 @@ spec:
         - mountPath: /etc/phpmyadmin/ssl
           name: ssl-certificates
           readOnly: true
-        # Un-comment if using client authentication
-        # - mountPath: /etc/phpmyadmin/ssl/client-cert.pem
-        #   name: client-cert
-        #   readOnly: true
-        # - mountPath: /etc/phpmyadmin/ssl/client-key.pem
-        #   name: client-key
-        #   readOnly: true
       resources:
         limits:
           memory: 1000Mi
@@ -206,15 +199,6 @@ spec:
         path: ./secrets/ssl/ca-cert.pem
         type: File
       name: ca-cert
-    # Un-comment if using client authentication
-    # - hostPath:
-    #     path: ./secrets/ssl/client-cert.pem
-    #     type: File
-    #   name: client-cert
-    # - hostPath:
-    #     path: ./secrets/ssl/client-key.pem
-    #     type: File
-    #   name: client-key
 ---
 apiVersion: v1
 kind: LimitRange
@@ -267,6 +251,10 @@ spec:
       volumeMounts:
         - mountPath: /var/www
           name: web-data
+        - mountPath: /var/www/public/doc
+          name: doc
+        - mountPath: /var/www/.env
+          name: dotenv
         - mountPath: /etc/localtime
           name: localtime-settings
           readOnly: true
@@ -279,13 +267,6 @@ spec:
         - mountPath: /etc/ssl/certs/server-key.pem
           name: server-key
           readOnly: true
-        # Un-comment if using client authentication
-        # - mountPath: /etc/ssl/certs/client-cert.pem
-        #   name: client-cert
-        #   readOnly: true
-        # - mountPath: /etc/ssl/certs/client-key.pem
-        #   name: client-key
-        #   readOnly: true
       resources:
         limits:
           memory: 2000Mi
@@ -298,6 +279,14 @@ spec:
         path: ./
         type: Directory
       name: web-data
+    - hostPath:
+        path: ./public/doc
+        type: Directory
+      name: doc
+    - hostPath:
+        path: .env
+        type: File
+      name: dotenv
     - hostPath:
         path: /etc/localtime
       name: localtime-settings
@@ -313,12 +302,3 @@ spec:
         path: ./secrets/ssl/server-key.pem
         type: File
       name: server-key
-    # Un-comment if using client authentication
-    # - hostPath:
-    #     path: ./secrets/ssl/client-cert.pem
-    #     type: File
-    #   name: client-cert
-    # - hostPath:
-    #     path: ./secrets/ssl/client-key.pem
-    #     type: File
-    #   name: client-key

From 6a95b334b5caec1c1d5ad586348b3d2a3fde0c6a Mon Sep 17 00:00:00 2001
From: SDKHISSI <admin.sdkhissi@SANCLP0031.ad.ponet>
Date: Mon, 27 Jan 2025 10:18:34 +0100
Subject: [PATCH 2/2] deleted client authentication related parameters

---
 template.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/template.yml b/template.yml
index b0d2a026..52c9933a 100755
--- a/template.yml
+++ b/template.yml
@@ -147,7 +147,7 @@ metadata:
     traefik.http.routers.docauposte-phpmyadmin.entrypoints: websecure
     traefik.http.routers.docauposte-phpmyadmin.tls: true
     # Remove or comment out the certresolver if using dedicated certificate files
-    traefik.http.routers.docauposte-phpmyadmin.tls.certresolver: myresolver
+    # traefik.http.routers.docauposte-phpmyadmin.tls.certresolver: myresolver
     traefik.http.routers.docauposte-phpmyadmin.middlewares: strip-docauposte-phpmyadmin-prefix
     traefik.http.services.docauposte-phpmyadmin.loadbalancer.server.port: 80
     traefik.http.middlewares.strip-docauposte-phpmyadmin-prefix.stripPrefix.prefixes: /dappma
@@ -165,11 +165,6 @@ spec:
           value: "true"
         - name: PMA_SSL_CA
           value: /etc/phpmyadmin/ssl/ca-cert.pem
-        # Un-comment if using client authentication
-        # - name: PMA_SSL_CERT
-        #   value: /etc/phpmyadmin/ssl/client-cert.pem
-        # - name: PMA_SSL_KEY
-        #   value: /etc/phpmyadmin/ssl/client-key.pem
       volumeMounts:
         - mountPath: /etc/phpmyadmin/config.user.inc.php
           name: phpmyadmin-config
@@ -225,7 +220,7 @@ metadata:
     traefik.http.routers.docauposte-web.entrypoints: websecure
     traefik.http.routers.docauposte-web.tls: true
     # Remove or comment out the certresolver if using dedicated certificate files
-    traefik.http.routers.docauposte-web.tls.certresolver: myresolver
+    # traefik.http.routers.docauposte-web.tls.certresolver: myresolver
     traefik.http.routers.docauposte-web.middlewares: strip-docauposte-web-prefix
     traefik.http.services.docauposte-web.loadbalancer.server.port: 80
     traefik.http.middlewares.strip-docauposte-web-prefix.stripPrefix.prefixes: /docauposte