From 1ebe5f8fe15ddf568e5d6f0b3a7bcc90f29aa25f Mon Sep 17 00:00:00 2001
From: elsombrante <52658122+elsombrante@users.noreply.github.com>
Date: Tue, 7 Nov 2023 10:20:10 +0100
Subject: [PATCH] Revert "Added apache configuration for better compatibility"

---
 apache/ports.conf                 | 16 ----------------
 apache/vhost-ssl.conf             |  2 +-
 apache/vhost.conf                 |  2 +-
 docker-compose.simple-install.yml |  1 -
 4 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 apache/ports.conf

diff --git a/apache/ports.conf b/apache/ports.conf
deleted file mode 100644
index 5185d89..0000000
--- a/apache/ports.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# If you just change the port or add more ports here, you will likely also
-# have to change the VirtualHost statement in
-# /etc/apache2/sites-enabled/000-default.conf
-
-Listen 80
-Listen 8080
- 
-<IfModule ssl_module>
-	Listen 443
-	Listen 8443
-</IfModule>
-
-<IfModule mod_gnutls.c>
-	Listen 443
-	Listen 8443
-</IfModule>
diff --git a/apache/vhost-ssl.conf b/apache/vhost-ssl.conf
index 6c599a9..fa62309 100644
--- a/apache/vhost-ssl.conf
+++ b/apache/vhost-ssl.conf
@@ -1,4 +1,4 @@
-<VirtualHost *:443 *:8443>
+<VirtualHost *:443>
     DocumentRoot "/var/www/eramba"
     <Directory "/var/www/eramba">
         AllowOverride all
diff --git a/apache/vhost.conf b/apache/vhost.conf
index 5d930c4..37e3dff 100644
--- a/apache/vhost.conf
+++ b/apache/vhost.conf
@@ -1,4 +1,4 @@
-<VirtualHost *:80 *:8080>
+<VirtualHost *:80>
 	DocumentRoot "/var/www/eramba"
     <Directory "/var/www/eramba">
         AllowOverride all
diff --git a/docker-compose.simple-install.yml b/docker-compose.simple-install.yml
index 06a5769..c863135 100644
--- a/docker-compose.simple-install.yml
+++ b/docker-compose.simple-install.yml
@@ -31,7 +31,6 @@ services:
       - ./apache/ssl/mycert.crt:/etc/ssl/certs/mycert.crt
       - ./apache/ssl/mycert.key:/etc/ssl/private/mycert.key
       - ./apache/security.conf:/etc/apache2/conf-available/security.conf
-      - ./apache/ports.conf:/etc/apache2/ports.conf
       - ./apache/vhost-ssl.conf:/etc/apache2/sites-available/000-default.conf
       - ./crontab/crontab:/etc/cron.d/eramba-crontab
     environment: