diff --git a/Dockerfile b/Dockerfile
index e1de2a9..965d455 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,4 @@
+
# Basis-Image: Apache + PHP
FROM php:8.2-apache
@@ -6,11 +7,24 @@ RUN docker-php-ext-install mysqli
# pdftk installieren
RUN apt-get update && \
- apt-get install -y pdftk net-tools geoip-bin && \
+ apt-get install -y \
+ pdftk \
+ net-tools \
+ msmtp \
+ msmtp-mta \
+ geoip-bin && \
apt-get clean && rm -rf /var/lib/apt/lists/*
# Apache Mod Rewrite aktivieren (optional)
RUN a2enmod rewrite
# NEU: AllowOverride All aktivieren, damit .htaccess funktioniert
-RUN sed -i '//,/<\/Directory>/ s/AllowOverride None/AllowOverride All/' /etc/apache2/apache2.conf
\ No newline at end of file
+RUN sed -i '//,/<\/Directory>/ s/AllowOverride None/AllowOverride All/' /etc/apache2/apache2.conf
+
+RUN echo "sendmail_path=/usr/bin/msmtp -t -i -f bruno.eckhardt07@gmail.com" > /usr/local/etc/php/conf.d/sendmail.ini
+
+COPY MAIL/msmtprc /etc/msmtprc
+
+RUN chmod 644 /etc/msmtprc
+
+RUN touch /var/log/msmtp.log && chmod 666 /var/log/msmtp.log
\ No newline at end of file
diff --git a/HAPROXY/haproxy.cfg b/HAPROXY/haproxy.cfg
index 3e8e54b..3736399 100644
--- a/HAPROXY/haproxy.cfg
+++ b/HAPROXY/haproxy.cfg
@@ -29,7 +29,7 @@ backend web_public
server node1 172.30.0.11:80 cookie node1 check
backend web_backend
- server node1 172.30.0.13:80 cookie node1 check
+ server node1 172.30.0.12:80 cookie node1 check
backend stats
mode http
diff --git a/docker-compose.yml b/docker-compose.yml
index 037118d..3cd56e1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
services:
haproxy:
image: haproxy:latest
- container_name: HAPROXY
+ container_name: haproxy
volumes:
- ./HAPROXY/:/usr/local/etc/haproxy
ports:
@@ -14,7 +14,7 @@ services:
webserver-public:
build: .
- container_name: WEBSERVER-PUBLIC
+ container_name: webserver_public
volumes:
- ./WEBSERVER/PUBLIC/WEBROOT/:/var/www/html/
ports:
@@ -26,19 +26,19 @@ services:
webserver-backend:
build: .
- container_name: WEBSERVER-BACKEND
+ container_name: webserver_backend
volumes:
- ./WEBSERVER/BACKEND/WEBROOT/:/var/www/html/
ports:
- "8002:80"
networks:
docker-net:
- ipv4_address: 172.30.0.13
+ ipv4_address: 172.30.0.12
restart: always
mariadb:
image: mariadb:latest
- container_name: MARIADB
+ container_name: mariadb
volumes:
- ./MARIADB:/var/lib/mysql
ports:
@@ -50,7 +50,7 @@ services:
MARIADB_PASSWORD: bBHofurUJWKzPE8Z
networks:
docker-net:
- ipv4_address: 172.30.0.12
+ ipv4_address: 172.30.0.13
restart: always
networks:
@@ -58,4 +58,4 @@ networks:
driver: bridge
ipam:
config:
- - subnet: 172.30.0.0/16
+ - subnet: 172.30.0.0/24
diff --git a/install.sh b/install.sh
index 36d3f86..72b427d 100644
--- a/install.sh
+++ b/install.sh
@@ -34,6 +34,6 @@ fi
git clone https://gitea.mrhossa.de/bruno/Backend.git $BASE_DIR/BACKEND
git -C $BASE_DIR/BACKEND checkout live
-docker restart webserver_backend
+# docker restart webserver_backend
git clone https://gitea.mrhossa.de/bruno/Web-Public.git $BASE_DIR/PUBLIC
\ No newline at end of file