Skip to content

Commit

Permalink
this should slim down the requirements somewhat
Browse files Browse the repository at this point in the history
  • Loading branch information
palmertab committed Dec 13, 2023
1 parent b632c4f commit 8654432
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 16 deletions.
10 changes: 9 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conf/apache2.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 0 additions & 4 deletions conf/rsyslog.conf
Original file line number Diff line number Diff line change
@@ -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
6 changes: 1 addition & 5 deletions conf/staging.tabroom.com.conf
Original file line number Diff line number Diff line change
@@ -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 [email protected]
ServerAdmin [email protected]

DocumentRoot /www/tabroom/web
ErrorLog /var/log/apache2/staging-tabroom-error.log
Expand Down
5 changes: 0 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit 8654432

Please sign in to comment.