From 70a79f0e827c4b4d0f49f9707f15a92f76fc2757 Mon Sep 17 00:00:00 2001 From: Chung Leong Date: Thu, 11 Apr 2019 21:04:05 +0200 Subject: [PATCH] Removed rwt mirror. --- docker-compose.yml | 17 --------------- server/nginx/default.conf | 45 ++++----------------------------------- 2 files changed, 4 insertions(+), 58 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 4df9b26..25630b2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -49,23 +49,6 @@ services: EXTERNAL_HOST: http://et.trambar.io command: [ node, /opt/example/server/index.js ] restart: always - node_rwt: - depends_on: - - nginx - image: node:8 - volumes: - - .:/opt/example - - web_cache:/var/cache/nginx - networks: - network: - ipv4_address: 172.130.0.5 - environment: - WORDPRESS_HOST: https://realworldtech.com - NGINX_HOST: http://nginx - NGINX_CACHE: /var/cache/nginx/data_rwt - EXTERNAL_HOST: http://rwt.trambar.io - command: [ node, /opt/example/server/index.js ] - restart: always db: image: mariadb:10 volumes: diff --git a/server/nginx/default.conf b/server/nginx/default.conf index e5fbdbb..f6330dc 100644 --- a/server/nginx/default.conf +++ b/server/nginx/default.conf @@ -1,6 +1,5 @@ proxy_cache_path /var/cache/nginx/data_pfj keys_zone=data_pfj:10m max_size=1g inactive=7d; proxy_cache_path /var/cache/nginx/data_et keys_zone=data_et:10m max_size=1g inactive=7d; -proxy_cache_path /var/cache/nginx/data_rwt keys_zone=data_rwt:10m max_size=1g inactive=7d; proxy_temp_path /var/cache/nginx/tmp; server { @@ -10,11 +9,11 @@ server { client_max_body_size 0; fastcgi_send_timeout 600; fastcgi_read_timeout 600; - proxy_connect_timeout 600; - proxy_send_timeout 600; - proxy_read_timeout 600; + proxy_connect_timeout 600; + proxy_send_timeout 600; + proxy_read_timeout 600; send_timeout 600; - + ssl_certificate /etc/letsencrypt/live/pfj.trambar.io/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/pfj.trambar.io/privkey.pem; @@ -83,38 +82,6 @@ server { } } -server { - listen 80; - listen 443 ssl http2; - server_name rwt.trambar.io; - - ssl_certificate /etc/letsencrypt/live/pfj.trambar.io/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/pfj.trambar.io/privkey.pem; - - location ^~ /.well-known/acme-challenge/ { - default_type "text/plain"; - root /var/www/certbot; - allow all; - } - - location / { - proxy_pass http://node_rwt; - proxy_set_header Host $http_host; - proxy_cache data_rwt; - proxy_cache_key $uri$is_args$args; - proxy_cache_min_uses 1; - proxy_cache_valid 400 404 1m; - proxy_hide_header Cache-Control; - proxy_ignore_headers Vary; - - add_header Access-Control-Allow-Origin *; - add_header Access-Control-Expose-Headers X-WP-Total; - add_header Cache-Control "public,max-age=0"; - add_header X-Cache-Date $upstream_http_date; - add_header X-Cache-Status $upstream_cache_status; - } -} - upstream wordpress { server wordpress:80; } @@ -126,7 +93,3 @@ upstream node_pfj { upstream node_et { server node_et:80; } - -upstream node_rwt { - server node_rwt:80; -}