Actualiser dockerfile

dockerfile

@@ -11,46 +11,51 @@ ARG SMTP_PASS
 ARG ADMIN_EMAIL
 
 # Installer les paquets nécessaires
-RUN apt-get update && apt-get install -y apache2 php php-cli php-mysql php-curl php-fpm php-gd php-json php-xml php-zip php-mbstring \
-        software-properties-common git openssl msmtp mariadb-client cron curl unzip nano
+RUN apt-get update && apt-get install -y \
+    apache2 \
+    php php-cli php-mysql php-curl php-fpm php-gd php-json php-xml php-zip php-mbstring php-bcmath php-gmp php-intl \
+    software-properties-common git msmtp mariadb-client cron curl unzip nano
 
 # Nettoyer
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-# Générer un certificat SSL auto-signé
-RUN mkdir -p /etc/ssl/private && mkdir -p /etc/ssl/certs && \
-        openssl req -x509 -nodes -subj "/C=FR/ST=France/L=Paris/O=organization/OU=Org/CN=${DOMAIN}" \
-        -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
-RUN a2dissite 000-default default-ssl
-RUN a2ensite $DOMAIN.conf
-RUN a2enmod ssl rewrite
+# Copier et activer la config Apache (HTTP uniquement)
+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 rewrite
 
 # Installer Hubzilla
-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/
+RUN git clone https://framagit.org/hubzilla/core.git /var/www/html && \
+    /bin/bash -c "cd /var/www/html && ./util/add_addon_repo https://framagit.org/hubzilla/addons.git official" && \
+    mkdir -p /var/www/html/store/[data]/smarty3 && \
+    chown -R www-data:www-data /var/www/html
+
 
 # Configurer msmtp
 COPY src/msmtprc /etc/msmtprc
-RUN sed -i "s/{{SMTP_EMAIL}}/${SMTP_EMAIL}/g" /etc/msmtprc && sed -i "s/{{SMTP_SERVER}}/${SMTP_SERVER}/g" /etc/msmtprc && \
-        sed -i "s/{{SMTP_PORT}}/${SMTP_PORT}/g" /etc/msmtprc && sed -i "s/{{SMTP_USER}}/${SMTP_USER}/g" /etc/msmtprc && \
-        sed -i "s/{{SMTP_PASS}}/${SMTP_PASS}/g" /etc/msmtprc
-                                
-RUN chmod 600 /etc/msmtprc && chown www-data:www-data /etc/msmtprc
+RUN sed -i "s/{{SMTP_EMAIL}}/${SMTP_EMAIL}/g" /etc/msmtprc && \
+    sed -i "s/{{SMTP_SERVER}}/${SMTP_SERVER}/g" /etc/msmtprc && \
+    sed -i "s/{{SMTP_PORT}}/${SMTP_PORT}/g" /etc/msmtprc && \
+    sed -i "s/{{SMTP_USER}}/${SMTP_USER}/g" /etc/msmtprc && \
+    sed -i "s/{{SMTP_PASS}}/${SMTP_PASS}/g" /etc/msmtprc && \
+    chmod 600 /etc/msmtprc && \
+    chown www-data:www-data /etc/msmtprc
+
+# Activer msmtp dans PHP
 RUN echo "sendmail_path = /usr/bin/msmtp -t" >> /etc/php/8.2/apache2/php.ini
 
-# Fichier .htconfig.php
-COPY src/.htconfig.php /var/www/html/.htconfig.php
+# Config PHP (upload size + register_argc_argv)
+RUN echo "upload_max_filesize = 20M" >> /etc/php/8.2/apache2/php.ini && \
+    echo "post_max_size = 20M" >> /etc/php/8.2/apache2/php.ini && \
+    echo "register_argc_argv = On" >> /etc/php/8.2/apache2/php.ini
+
+# Fichier .htconfig.php (préconfiguré)
+COPY src/.htconfig.php /tmp/.htconfig.php
 RUN LOCATION_HASH=$(cat /dev/urandom | tr -dc 'a-f0-9' | fold -w 64 | head -n 1) && \
-        sed -i "s/{{DOMAIN}}/${DOMAIN}/g" /var/www/html/.htconfig.php && \
-        sed -i "s/{{LOCATION_HASH}}/${LOCATION_HASH}/g" /var/www/html/.htconfig.php && \
-        sed -i "s/{{ADMIN_EMAIL}}/${ADMIN_EMAIL}/g" /var/www/html/.htconfig.php
+    sed "s/{{DOMAIN}}/${DOMAIN}/g; s/{{LOCATION_HASH}}/${LOCATION_HASH}/g; s/{{ADMIN_EMAIL}}/${ADMIN_EMAIL}/g" /tmp/.htconfig.php > /var/www/html/.htconfig.php && \
+    chown www-data:www-data /var/www/html/.htconfig.php
 
 # Cron
 RUN echo "*/15 * * * * cd /var/www/html; /usr/bin/php Zotlabs/Daemon/Master.php Cron" | crontab -u www-data -
@@ -58,4 +63,4 @@ RUN echo "*/15 * * * * cd /var/www/html; /usr/bin/php Zotlabs/Daemon/Master.php
 # Script de démarrage
 COPY src/start.sh /start.sh
 RUN chmod +x /start.sh
-CMD ["/bin/bash", "/start.sh"]
+CMD ["/bin/bash", "/start.sh"]

src/.htconfig.php

@@ -6,7 +6,8 @@ define('Z_PATH', dirname(__FILE__));
 define('Z_CONFIG', dirname(__FILE__));
 define('Z_DATA', 'store');
 
-$db_host = 'db';            // à ajuster si besoin
+// Base de données
+$db_host = 'db';
 $db_port = 3306;
 $db_user = 'hubzilla';
 $db_pass = 'hubzilla_pass';
@@ -15,7 +16,6 @@ $db_data = 'hubzilla';
 $default_timezone = 'Europe/Paris';
 
 $hostname = '{{DOMAIN}}';
-$directory = '';
 $site_location = 'https://{{DOMAIN}}/';
 $admin_email = '{{ADMIN_EMAIL}}';
 $site_id = '{{LOCATION_HASH}}';

src/container_apache.conf

@@ -1,21 +1,12 @@
 <VirtualHost *:80>
     ServerName {{DOMAIN}}
-    Redirect permanent / https://{{DOMAIN}}/
-</VirtualHost>
-
-<VirtualHost *:443>
-    ServerName {{DOMAIN}}
-
     DocumentRoot /var/www/html
+
     <Directory /var/www/html>
         AllowOverride All
         Require all granted
     </Directory>
 
-    SSLEngine on
-    SSLCertificateFile /etc/ssl/certs/{{DOMAIN}}.crt
-    SSLCertificateKeyFile /etc/ssl/private/{{DOMAIN}}.key
-
-    ErrorLog ${APACHE_LOG_DIR}/error.log
-    CustomLog ${APACHE_LOG_DIR}/access.log combined
-</VirtualHost>
+    ErrorLog ${APACHE_LOG_DIR}/hubzilla_error.log
+    CustomLog ${APACHE_LOG_DIR}/hubzilla_access.log combined
+</VirtualHost>