From 1bcf046757c39883f778f27c91da339619a2d798 Mon Sep 17 00:00:00 2001
From: Emilien Devos <121870973+edevosc2c@users.noreply.github.com>
Date: Wed, 12 Jun 2024 18:04:41 +0200
Subject: [PATCH] use correct path for httpd config virtualhost

---
 apache-mod-mellon/templates/apache-depl.yaml | 5 ++++-
 apache-mod-mellon/templates/apache-svc.yaml  | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apache-mod-mellon/templates/apache-depl.yaml b/apache-mod-mellon/templates/apache-depl.yaml
index 0ac6623..25825d3 100644
--- a/apache-mod-mellon/templates/apache-depl.yaml
+++ b/apache-mod-mellon/templates/apache-depl.yaml
@@ -17,6 +17,9 @@ spec:
         - name: apache
           image: ghcr.io/camptocamp/inrae-docker-images/apache-mod-mellon:2.4
           imagePullPolicy: Always
+          ports:
+          - containerPort: 80
+            name: http
           livenessProbe:
             httpGet:
               path: /
@@ -31,7 +34,7 @@ spec:
             timeoutSeconds: 5
           volumeMounts:
           - name: virtualhost-config
-            mountPath: /etc/apache2/sites-available/000-default.conf
+            mountPath: /usr/local/apache2/conf/extra/000-default.conf
             subPath: 000-default.conf
           - name: mod-mellon-config
             mountPath: /etc/mod-mellon-config
diff --git a/apache-mod-mellon/templates/apache-svc.yaml b/apache-mod-mellon/templates/apache-svc.yaml
index ab74339..f870439 100644
--- a/apache-mod-mellon/templates/apache-svc.yaml
+++ b/apache-mod-mellon/templates/apache-svc.yaml
@@ -7,7 +7,7 @@ metadata:
 spec:
   ports:
     - port: 80
-      targetPort: 80
+      targetPort: http
       protocol: TCP
   selector:
     {{- include "apache-mod-mellon.selectorLabels" . | nindent 4 }}-apache-depl