changing some things to add support for external https proxy

This commit is contained in:
Janis Steiner
2024-12-31 15:39:43 +01:00
parent 47d009e96f
commit ce42097ad6
2 changed files with 6 additions and 21 deletions

View File

@@ -1,5 +1,5 @@
<VirtualHost *:80> <VirtualHost *:80>
ServerName auth.jakach.srv ServerName auth.jakach.ch
DocumentRoot /var/www/html DocumentRoot /var/www/html
<Directory /var/www/html> <Directory /var/www/html>
@@ -10,21 +10,3 @@
ErrorLog ${APACHE_LOG_DIR}/error.log ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined CustomLog ${APACHE_LOG_DIR}/access.log combined
</VirtualHost> </VirtualHost>
<VirtualHost *:443>
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
<Directory /var/www/html>
Options FollowSymLinks
AllowOverride All
Require all granted
</Directory>
ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined
</VirtualHost>

View File

@@ -4,6 +4,7 @@ services:
jakach-login-db: jakach-login-db:
image: yobasystems/alpine-mariadb:latest image: yobasystems/alpine-mariadb:latest
container_name: jakach-login-db container_name: jakach-login-db
restart: unless-stopped
environment: environment:
MYSQL_ROOT_PASSWORD: 1234 MYSQL_ROOT_PASSWORD: 1234
networks: networks:
@@ -17,12 +18,14 @@ services:
context: . context: .
dockerfile: srv_dockerfile dockerfile: srv_dockerfile
container_name: jakach-login-srv container_name: jakach-login-srv
restart: unless-stopped
networks: networks:
jakach-login-network: jakach-login-network:
ipv4_address: 192.168.5.3 ipv4_address: 192.168.5.3
ports: ports:
- "444:443" # - "444:443"
- "80:443" # - "80:443"
- "446:80"
depends_on: depends_on:
- jakach-login-db - jakach-login-db
volumes: volumes: