Permalink
Browse files

Simplify paths.

  • Loading branch information...
WhiteHalmos committed Sep 14, 2015
1 parent 397b615 commit 663bc997a03dcbf6985f27cea3c4e6f449e820ff
Showing with 12 additions and 19 deletions.
  1. +4 −4 docker-compose.yml
  2. +1 −1 matchmaker/rungame.py
  3. +7 −14 nginx/default.conf
@@ -15,7 +15,7 @@ matchmaker:
links:
- db
volumes:
- ./matchlog:/var/log/robot/matches
- ./matchlog:/matchlog
- ./matchmaker:/usr/src/app
webapp:
build: webapp
@@ -30,16 +30,16 @@ server:
ports:
- "8000:80"
volumes:
- ./matchlog:/usr/local/matchlog
- ./matchlog:/matchlog
- ./nginx/default.conf:/etc/nginx/conf.d/default.conf
- ./static:/usr/local/static
- ./static:/static
run:
command: One-off runner for rgserver
entrypoint: /bin/echo
image: postgres:9.4
links:
- db
volumes:
- ./matchlog:/matchlog
- ./dbbackups:/dbbackups
- ./matchlog:/matchlog
- ./sql:/sql
@@ -193,7 +193,7 @@ def run_game(db, match, output_file):
def run_match(db, match):
sys.stdout.flush()
sys.stderr.flush()
with open('/var/log/robot/matches/%d' % match['id'], 'w+') as f:
with open('/matchlog/%d' % match['id'], 'w+') as f:
try:
sys.stdout = sys.stderr = f
db.update('matches', where='id=$id', vars={'id': match['id']},
@@ -1,28 +1,21 @@
server {
listen 80 default_server;
listen 80;
location /robots.txt {
alias /usr/local/static/robots.txt;
alias /static/robots.txt;
}
location /favicon.ico {
expires 168h;
add_header Pragma public;
add_header Cache-Control "public, must-revalidate, proxy-revalidate";
alias /usr/local/static/favicon.png;
alias /static/favicon.png;
}
location /static {
expires 168h;
add_header Pragma public;
add_header Cache-Control "public, must-revalidate, proxy-revalidate";
alias /usr/local/static;
alias /static;
}
location /matchlog {
expires max;
add_header Pragma public;
add_header Cache-Control "public, must-revalidate, proxy-revalidate";
default_type text/plain;
alias /usr/local/matchlog;
alias /matchlog;
}
location / {

0 comments on commit 663bc99

Please sign in to comment.