diff --git a/docker-compose.yml b/docker-compose.yml index a4d47b9..d5c8854 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,4 +9,6 @@ services: proxy: build: context: tools/apache-hosts +# environment: +# - HOST=example.com network_mode: "host" diff --git a/tools/apache-hosts/Dockerfile b/tools/apache-hosts/Dockerfile index 7b82796..0083e6a 100644 --- a/tools/apache-hosts/Dockerfile +++ b/tools/apache-hosts/Dockerfile @@ -2,6 +2,10 @@ FROM httpd:2.4-alpine ENV APACHE_LOG_DIR=/usr/local/apache2/logs +# Change this if you have your own domain name set up +# Otherwise, you will need to set up a DNS server to point nintendowifi.net to your IP address +ENV HOST=nintendowifi.net + # TODO: do in one line RUN echo $'IncludeOptional /usr/local/apache2/vhost.d/*.conf\n\ ServerName localhost\n\ diff --git a/tools/apache-hosts/dls1.nintendowifi.net.conf b/tools/apache-hosts/dls1.nintendowifi.net.conf index fda65ea..1b46827 100644 --- a/tools/apache-hosts/dls1.nintendowifi.net.conf +++ b/tools/apache-hosts/dls1.nintendowifi.net.conf @@ -1,8 +1,8 @@ ServerAdmin webmaster@localhost - ServerName dls1.nintendowifi.net - ServerAlias "dls1.nintendowifi.net" - ServerAlias "dls1.nintendowifi.net, dls1.nintendowifi.net" + ServerName dls1.${HOST} + ServerAlias "dls1.${HOST}" + ServerAlias "dls1.${HOST}, dls1.${HOST}" ProxyPreserveHost On ProxyPass / http://127.0.0.1:9003/ ProxyPassReverse / http://127.0.0.1:9003/ diff --git a/tools/apache-hosts/gamestats.gs.nintendowifi.net.conf b/tools/apache-hosts/gamestats.gs.nintendowifi.net.conf index dc67950..df9a761 100644 --- a/tools/apache-hosts/gamestats.gs.nintendowifi.net.conf +++ b/tools/apache-hosts/gamestats.gs.nintendowifi.net.conf @@ -1,7 +1,7 @@ ServerAdmin webmaster@localhost - ServerName gamestats.gs.nintendowifi.net - ServerAlias "gamestats.gs.nintendowifi.net, gamestats.gs.nintendowifi.net" + ServerName gamestats.gs.${HOST} + ServerAlias "gamestats.gs.${HOST}, gamestats.gs.${HOST}" ProxyPreserveHost On ProxyPass / http://127.0.0.1:9002/ ProxyPassReverse / http://127.0.0.1:9002/ diff --git a/tools/apache-hosts/gamestats2.gs.nintendowifi.net.conf b/tools/apache-hosts/gamestats2.gs.nintendowifi.net.conf index 3f79350..21da7b9 100644 --- a/tools/apache-hosts/gamestats2.gs.nintendowifi.net.conf +++ b/tools/apache-hosts/gamestats2.gs.nintendowifi.net.conf @@ -1,7 +1,7 @@ ServerAdmin webmaster@localhost - ServerName gamestats2.gs.nintendowifi.net - ServerAlias "gamestats2.gs.nintendowifi.net, gamestats2.gs.nintendowifi.net" + ServerName gamestats2.gs.${HOST} + ServerAlias "gamestats2.gs.${HOST}, gamestats2.gs.${HOST}" ProxyPreserveHost On diff --git a/tools/apache-hosts/nas-naswii-conntest.nintendowifi.net.conf b/tools/apache-hosts/nas-naswii-conntest.nintendowifi.net.conf index 94da24c..68fe032 100644 --- a/tools/apache-hosts/nas-naswii-conntest.nintendowifi.net.conf +++ b/tools/apache-hosts/nas-naswii-conntest.nintendowifi.net.conf @@ -1,11 +1,11 @@ ServerAdmin webmaster@localhost - ServerName naswii.nintendowifi.net - ServerAlias "naswii.nintendowifi.net, naswii.nintendowifi.net" - ServerAlias "nas.nintendowifi.net" - ServerAlias "nas.nintendowifi.net, nas.nintendowifi.net" - ServerAlias "conntest.nintendowifi.net" - ServerAlias "conntest.nintendowifi.net, conntest.nintendowifi.net" + ServerName naswii.${HOST} + ServerAlias "naswii.${HOST}, naswii.${HOST}" + ServerAlias "nas.${HOST}" + ServerAlias "nas.${HOST}, nas.${HOST}" + ServerAlias "conntest.${HOST}" + ServerAlias "conntest.${HOST}, conntest.${HOST}" ProxyPreserveHost On ProxyPass / http://127.0.0.1:9000/ ProxyPassReverse / http://127.0.0.1:9000/ diff --git a/tools/apache-hosts/sake.gs.nintendowifi.net.conf b/tools/apache-hosts/sake.gs.nintendowifi.net.conf index ab854a6..2e6ed0b 100644 --- a/tools/apache-hosts/sake.gs.nintendowifi.net.conf +++ b/tools/apache-hosts/sake.gs.nintendowifi.net.conf @@ -1,9 +1,9 @@ ServerAdmin webmaster@localhost - ServerName sake.gs.nintendowifi.net - ServerAlias sake.gs.nintendowifi.net *.sake.gs.nintendowifi.net - ServerAlias secure.sake.gs.nintendowifi.net - ServerAlias secure.sake.gs.nintendowifi.net *.secure.sake.gs.nintendowifi.net + ServerName sake.gs.${HOST} + ServerAlias sake.gs.${HOST} *.sake.gs.${HOST} + ServerAlias secure.sake.gs.${HOST} + ServerAlias secure.sake.gs.${HOST} *.secure.sake.gs.${HOST} ProxyPass / http://127.0.0.1:8000/