From 960933aaa03b813ab721551dad446e927a837f70 Mon Sep 17 00:00:00 2001
From: sylvain <sylvain@alto.im>
Date: Wed, 14 May 2025 20:26:04 +0000
Subject: [PATCH] Actualiser dockerfile

---
 dockerfile | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/dockerfile b/dockerfile
index 102aa80..63fdb82 100644
--- a/dockerfile
+++ b/dockerfile
@@ -23,19 +23,17 @@ RUN mkdir -p /etc/ssl/private && mkdir -p /etc/ssl/certs && \
         -newkey rsa:4096 -keyout /etc/ssl/private/${DOMAIN}.key -out /etc/ssl/certs/${DOMAIN}.crt -days 365
 
 # Copier et activer la config Apache
-COPY src/container_apache.conf /etc/apache2/sites-available/${DOMAIN}.conf
-RUN sed -i "s/{{DOMAIN}}/${DOMAIN}/g" /etc/apache2/sites-available/${DOMAIN}.conf && a2dissite 000-default.conf && \
-        a2ensite ${DOMAIN}.conf && a2enmod ssl rewrite headers
-
-RUN echo "ServerName {{DOMAIN}}" >> /etc/apache2/apache2.conf
-RUN echo "ServerName {{DOMAIN}}" >> /etc/apache2/apache2.conf
+COPY src/container_apache.conf /etc/apache2/sites-available/$DOMAIN.conf
+RUN sed -i "s/{{DOMAIN}}/$DOMAIN/g" /etc/apache2/sites-available/$DOMAIN.conf
+RUN a2dissite 000-default default-ssl
+RUN a2ensite $DOMAIN.conf
+RUN a2enmod ssl rewrite
 
 # Installer Hubzilla
-WORKDIR /var/www/html
-RUN rm -rf /var/www/html/* && \
-    git clone https://framagit.org/hubzilla/core.git . && \
-    util/add_addon_repo https://framagit.org/hubzilla/addons.git official && \
-    mkdir -p /var/www/html/store/[data]/smarty3 && \
+RUN rm -r /var/www/html/
+RUN git clone https://framagit.org/hubzilla/core.git /var/www/html/
+RUN cd /var/www/html/ && util/add_addon_repo https://framagit.org/hubzilla/addons.git official
+RUN mkdir -p "/var/www/html/store/[data]/smarty3" && \
     chown -R www-data:www-data /var/www/html/
 
 # Configurer msmtp