From 86544323c84de7bf76e4d7e4d4ffcbe3eedc3278 Mon Sep 17 00:00:00 2001
From: Chris Palmer <palmer@tabroom.com>
Date: Wed, 13 Dec 2023 16:30:59 -0500
Subject: [PATCH] this should slim down the requirements somewhat

---
 Dockerfile                    | 10 +++++++++-
 conf/apache2.conf             |  2 +-
 conf/rsyslog.conf             |  4 ----
 conf/staging.tabroom.com.conf |  6 +-----
 docker-compose.yml            |  5 -----
 5 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index caf9ae9..f82abda 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -107,11 +107,19 @@ RUN /usr/sbin/a2enmod proxy_http
 RUN /usr/sbin/a2enmod lbmethod_byrequests
 
 COPY ./conf/staging.tabroom.com.conf /etc/apache2/sites-available/tabroom.com.conf
+RUN a2dissite 000-default
 RUN a2ensite tabroom.com
 
+COPY ./conf/envvars /etc/apache2/envvars
+COPY ./conf/apache2.conf /etc/apache2/apache2.conf
+COPY ./conf/perl.conf /etc/apache2/mods-enabled/perl.conf
+
+RUN /usr/sbin/a2dismod perl
+RUN /usr/sbin/a2enmod perl
+
 COPY ./conf/mpm_prefork.conf /etc/apache2/mods-available
-RUN /usr/sbin/a2dismod mpm_prefork
 RUN /usr/sbin/a2dismod mpm_event
+RUN /usr/sbin/a2dismod mpm_prefork
 RUN /usr/sbin/a2enmod mpm_prefork
 
 EXPOSE 80
diff --git a/conf/apache2.conf b/conf/apache2.conf
index cb4c1b2..e90da8e 100644
--- a/conf/apache2.conf
+++ b/conf/apache2.conf
@@ -67,7 +67,7 @@
 # Do NOT add a slash at the end of the directory path.
 #
 #ServerRoot "/etc/apache2"
-ServerName mihashi.tabroom.com
+ServerName staging.tabroom.com
 
 #
 # The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
diff --git a/conf/rsyslog.conf b/conf/rsyslog.conf
index dbec11c..1020496 100644
--- a/conf/rsyslog.conf
+++ b/conf/rsyslog.conf
@@ -1,6 +1,2 @@
 local3.*            -/var/log/tabroom/debug.log
 local5.*            -/var/log/tabroom/event.log
-
-local3.*             @@logs.speechanddebate.org:514
-local5.*             @@logs.speechanddebate.org:514
-local6.*             @@logs.speechanddebate.org:514
diff --git a/conf/staging.tabroom.com.conf b/conf/staging.tabroom.com.conf
index 751ed30..29ae999 100644
--- a/conf/staging.tabroom.com.conf
+++ b/conf/staging.tabroom.com.conf
@@ -1,9 +1,5 @@
 <VirtualHost *:80>
-	ServerName  old.staging.tabroom.com
-	ServerAlias old.staging staging-old
-	ServerAlias staging.tabroom.com
-	ServerAlias local.tabroom.com
-	ServerAdmin webmaster@staging.tabroom.com
+	ServerAdmin webmaster@tabroom.com
 
 	DocumentRoot /www/tabroom/web
 	ErrorLog /var/log/apache2/staging-tabroom-error.log
diff --git a/docker-compose.yml b/docker-compose.yml
index 09f9b44..0d44aee 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,11 +16,6 @@ services:
       - /www/profiles:/www/profiles:rw
       - /var/log/apache2:/var/log/apache2:rw
       - /etc/tabroom/General.pm:/www/tabroom/web/lib/Tab/General.pm:ro
-      - /etc/tabroom/staging.tabroom.com.conf:/etc/apache2/sites-enabled/staging.tabroom.com.conf:ro
-      - /etc/tabroom/envvars:/etc/apache2/envvars:ro
-      - /etc/tabroom/apache2.conf:/etc/apache2/apache2.conf:ro
-      - /etc/tabroom/perl.conf:/etc/apache2/mods-enabled/perl.conf:ro
-      - /etc/tabroom/mpm_prefork.conf:/etc/apache2/mods-enabled/mpm_prefork.conf:ro
     extra_hosts:
       - "host.docker.internal:host-gateway"
       - "staging-api.tabroom.com:host-gateway"