From ce42097ad68ee6194a720100df5a7d4886c4669a Mon Sep 17 00:00:00 2001 From: Janis Steiner Date: Tue, 31 Dec 2024 15:39:43 +0100 Subject: [PATCH] changing some things to add support for external https proxy --- apache-conf/000-default.conf | 20 +------------------- docker-compose.yml | 7 +++++-- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/apache-conf/000-default.conf b/apache-conf/000-default.conf index 49e2ef7..18935c8 100644 --- a/apache-conf/000-default.conf +++ b/apache-conf/000-default.conf @@ -1,5 +1,5 @@ - ServerName auth.jakach.srv + ServerName auth.jakach.ch DocumentRoot /var/www/html @@ -10,21 +10,3 @@ ErrorLog ${APACHE_LOG_DIR}/error.log CustomLog ${APACHE_LOG_DIR}/access.log combined - - - ServerName auth.jakach.srv - DocumentRoot /var/www/html - - SSLEngine on - SSLCertificateKeyFile /etc/apache2/certs/privkey.pem - SSLCertificateFile /etc/apache2/certs/fullchain.pem - SSLCertificateChainFile /etc/apache2/certs/fullchain.pem - - - Options FollowSymLinks - AllowOverride All - Require all granted - - ErrorLog ${APACHE_LOG_DIR}/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined - diff --git a/docker-compose.yml b/docker-compose.yml index f69599b..275fc45 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,6 +4,7 @@ services: jakach-login-db: image: yobasystems/alpine-mariadb:latest container_name: jakach-login-db + restart: unless-stopped environment: MYSQL_ROOT_PASSWORD: 1234 networks: @@ -17,12 +18,14 @@ services: context: . dockerfile: srv_dockerfile container_name: jakach-login-srv + restart: unless-stopped networks: jakach-login-network: ipv4_address: 192.168.5.3 ports: - - "444:443" - - "80:443" + # - "444:443" + # - "80:443" + - "446:80" depends_on: - jakach-login-db volumes: