Skip to content

Commit 7cc0e9d

Browse files
florensieflorensie
committed
Relocate docker stuff, separate vhosts for docker
1 parent efb7ca1 commit 7cc0e9d

13 files changed

Lines changed: 75 additions & 22 deletions

‎tools/apache-hosts/dls1.nintendowifi.net.conf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<VirtualHost *:80>
22
ServerAdmin webmaster@localhost
3-
ServerName dls1.${HOST}
4-
ServerAlias "dls1.${HOST}"
5-
ServerAlias "dls1.${HOST}, dls1.${HOST}"
3+
ServerName dls1.nintendowifi.net
4+
ServerAlias "dls1.nintendowifi.net"
5+
ServerAlias "dls1.nintendowifi.net, dls1.nintendowifi.net"
66
ProxyPreserveHost On
77
ProxyPass / http://127.0.0.1:9003/
88
ProxyPassReverse / http://127.0.0.1:9003/

‎tools/apache-hosts/gamestats.gs.nintendowifi.net.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<VirtualHost *:80>
22
ServerAdmin webmaster@localhost
3-
ServerName gamestats.gs.${HOST}
4-
ServerAlias "gamestats.gs.${HOST}, gamestats.gs.${HOST}"
3+
ServerName gamestats.gs.nintendowifi.net
4+
ServerAlias "gamestats.gs.nintendowifi.net, gamestats.gs.nintendowifi.net"
55
ProxyPreserveHost On
66
ProxyPass / http://127.0.0.1:9002/
77
ProxyPassReverse / http://127.0.0.1:9002/

‎tools/apache-hosts/gamestats2.gs.nintendowifi.net.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<VirtualHost *:80>
22
ServerAdmin webmaster@localhost
3-
ServerName gamestats2.gs.${HOST}
4-
ServerAlias "gamestats2.gs.${HOST}, gamestats2.gs.${HOST}"
3+
ServerName gamestats2.gs.nintendowifi.net
4+
ServerAlias "gamestats2.gs.nintendowifi.net, gamestats2.gs.nintendowifi.net"
55

66
ProxyPreserveHost On
77

‎tools/apache-hosts/nas-naswii-conntest.nintendowifi.net.conf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<VirtualHost *:80>
22
ServerAdmin webmaster@localhost
3-
ServerName naswii.${HOST}
4-
ServerAlias "naswii.${HOST}, naswii.${HOST}"
5-
ServerAlias "nas.${HOST}"
6-
ServerAlias "nas.${HOST}, nas.${HOST}"
7-
ServerAlias "conntest.${HOST}"
8-
ServerAlias "conntest.${HOST}, conntest.${HOST}"
3+
ServerName naswii.nintendowifi.net
4+
ServerAlias "naswii.nintendowifi.net, naswii.nintendowifi.net"
5+
ServerAlias "nas.nintendowifi.net"
6+
ServerAlias "nas.nintendowifi.net, nas.nintendowifi.net"
7+
ServerAlias "conntest.nintendowifi.net"
8+
ServerAlias "conntest.nintendowifi.net, conntest.nintendowifi.net"
99
ProxyPreserveHost On
1010
ProxyPass / http://127.0.0.1:9000/
1111
ProxyPassReverse / http://127.0.0.1:9000/

‎tools/apache-hosts/sake.gs.nintendowifi.net.conf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<VirtualHost *:80>
22
ServerAdmin webmaster@localhost
3-
ServerName sake.gs.${HOST}
4-
ServerAlias sake.gs.${HOST} *.sake.gs.${HOST}
5-
ServerAlias secure.sake.gs.${HOST}
6-
ServerAlias secure.sake.gs.${HOST} *.secure.sake.gs.${HOST}
3+
ServerName sake.gs.nintendowifi.net
4+
ServerAlias sake.gs.nintendowifi.net *.sake.gs.nintendowifi.net
5+
ServerAlias secure.sake.gs.nintendowifi.net
6+
ServerAlias secure.sake.gs.nintendowifi.net *.secure.sake.gs.nintendowifi.net
77

88
ProxyPass / http://127.0.0.1:8000/
99

Dockerfile renamed to tools/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM python:2-alpine
33
RUN apk add --no-cache musl-dev gcc
44
RUN pip install twisted
55

6-
COPY . /app
6+
COPY ../.. /app
77
WORKDIR /app
88

99
ENTRYPOINT ["python", "master_server.py"]

tools/apache-hosts/Dockerfile renamed to tools/docker/apache-hosts/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,16 @@ ENV APACHE_LOG_DIR=/usr/local/apache2/logs
44

55
# Change this if you have your own domain name set up
66
# Otherwise, you will need to set up a DNS server to point nintendowifi.net to your IP address
7-
ENV HOST=nintendowifi.net
7+
ENV DWC_HOST=nintendowifi.net
88

9-
# TODO: do in one line
9+
# vhost config
1010
RUN echo $'IncludeOptional /usr/local/apache2/vhost.d/*.conf\n\
1111
ServerName localhost\n\
1212
HttpProtocolOptions Unsafe' >> conf/httpd.conf
13+
14+
# Enable proxy module
1315
RUN sed -i 's/^#LoadModule proxy_module/LoadModule proxy_module/' conf/httpd.conf
1416
RUN sed -i 's/^#LoadModule proxy_http_module/LoadModule proxy_http_module/' conf/httpd.conf
1517

18+
# Copy vhosts
1619
COPY *.conf vhost.d/

‎tools/docker/apache-hosts/dls1.nintendowifi.net.conf‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<VirtualHost *:80>
2+
ServerAdmin webmaster@localhost
3+
ServerName dls1.${DWC_HOST}
4+
ServerAlias "dls1.${DWC_HOST}"
5+
ServerAlias "dls1.${DWC_HOST}, dls1.${DWC_HOST}"
6+
ProxyPreserveHost On
7+
ProxyPass / http://127.0.0.1:9003/
8+
ProxyPassReverse / http://127.0.0.1:9003/
9+
</VirtualHost>

‎tools/docker/apache-hosts/gamestats.gs.nintendowifi.net.conf‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<VirtualHost *:80>
2+
ServerAdmin webmaster@localhost
3+
ServerName gamestats.gs.${DWC_HOST}
4+
ServerAlias "gamestats.gs.${DWC_HOST}, gamestats.gs.${DWC_HOST}"
5+
ProxyPreserveHost On
6+
ProxyPass / http://127.0.0.1:9002/
7+
ProxyPassReverse / http://127.0.0.1:9002/
8+
</VirtualHost>

‎tools/docker/apache-hosts/gamestats2.gs.nintendowifi.net.conf‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<VirtualHost *:80>
2+
ServerAdmin webmaster@localhost
3+
ServerName gamestats2.gs.${DWC_HOST}
4+
ServerAlias "gamestats2.gs.${DWC_HOST}, gamestats2.gs.${DWC_HOST}"
5+
6+
ProxyPreserveHost On
7+
8+
ProxyPass / http://127.0.0.1:9002/
9+
ProxyPassReverse / http://127.0.0.1:9002/
10+
</VirtualHost>

0 commit comments

Comments
 (0)