adjust to new frontend

api.tmpl

@@ -1,26 +0,0 @@
-server {
-	listen 80;
-	server_name api.${HOST};
-	root /usr/share/nginx/html;
-
-	client_max_body_size 200m;
-
-	include upload.conf;
-
-	index index.php;
-
-	try_files $uri /index.php?$query_string /index.php;
-
-	set_real_ip_from  10.0.0.0/8;
-	set_real_ip_from  172.16.0.0/12;
-	set_real_ip_from  192.168.0.0/16;
-	real_ip_header    X-Forwarded-For;
-
-	location ~ ^(.+?\.php)(/.*)?$ {
-		fastcgi_param  PATH_INFO $2;
-		fastcgi_pass   api:9000;
-		fastcgi_index  index.php;
-		fastcgi_param  SCRIPT_FILENAME /app/src/public/index.php;
-		include        fastcgi_params;
-	}
-}

docker-compose.yml

@@ -3,23 +3,21 @@ version: '2'
 services:
   frontend:
     restart: always
-    image: demostf/demos.tf
+    image: demostf/frontend
-    container_name: nginx
+    container_name: frontend
-    volumes:
-      - "certs:/etc/nginx/certs:ro"
-      - "./api.tmpl:/etc/nginx/conf.d/api.tmpl"
-      - "./static.tmpl:/etc/nginx/conf.d/static.tmpl"
-      - "./sync.tmpl:/etc/nginx/conf.d/sync.tmpl"
-      - "./maps.tmpl:/etc/nginx/conf.d/maps.tmpl"
-      - "${DEMO_ROOT}:/demos"
     environment:
-     - HOST=${HOST}
+      - "SITE_URL=https://${HOST}/"
-     - UPLOAD_FASTCGI=api:9000
+      - "SITE_API=https://api.${HOST}/"
-     - UPLOAD_SCRIPT=/app/src/public/upload.php
+      - "SITE_MAPS=https://maps.${HOST}/"
+      - "DATABASE_HOSTNAME=db"
+      - "DATABASE_USERNAME=postgres"
+      - "DATABASE_PASSWORD=${DB_PASSWORD}"
+      - "RUST_LOG=debug,hyper=info"
     networks:
       - proxy-tier
+      - db-tier
     depends_on:
-      - api
+      - db
 
   api:
     restart: always
@@ -43,15 +41,6 @@ services:
     networks:
       - proxy-tier
       - db-tier
-      - parser-tier
-
-  parser:
-    restart: always
-    image: demostf/demoserver
-    container_name: parser
-    mem_limit: 256m
-    networks:
-      - parser-tier
   
   sync:
     restart: always
@@ -96,17 +85,17 @@ services:
     image: demostf/proxy
     container_name: proxy
     environment:
-    - HOST=$HOST
+      - HOST=$HOST
-    - TARGET=nginx
+      - CERTBOT_EMAIL=$EMAIL
-    - CERTBOT_EMAIL=$EMAIL
     networks:
-    - proxy-tier
+      - proxy-tier
     volumes:
-    - ./letsencrypt:/etc/letsencrypt
+      - "${DEMO_ROOT}:/demos"
-    - logs:/logs
+      - ./letsencrypt:/etc/letsencrypt
+      - logs:/logs
     ports:
-    - "80:80"
+      - "80:80"
-    - "443:443"
+      - "443:443"
 
   promtail:
     image: grafana/promtail:latest
@@ -125,5 +114,4 @@ networks:
   parser-tier:
 
 volumes:
-  certs:
   logs:

maps.tmpl

@@ -1,13 +0,0 @@
-server {
-	listen 80;
-	server_name maps.${HOST};
-
-	add_header 'Access-Control-Allow-Origin' '*';
-
-	location / {
-		proxy_pass http://maps;
-		proxy_http_version 1.1;
-		proxy_set_header Upgrade ${DOLLAR}http_upgrade;
-		proxy_set_header Connection "upgrade";
-	}
-}

static.tmpl

@@ -1,8 +0,0 @@
-server {
-	listen 80;
-	server_name static.${HOST};
-
-	add_header 'Access-Control-Allow-Origin' '*';
-
-	root /demos;
-}

sync.tmpl

@@ -1,13 +0,0 @@
-server {
-	listen 80;
-	server_name sync.${HOST};
-
-	add_header 'Access-Control-Allow-Origin' '*';
-
-	location / {
-		proxy_pass http://sync;
-		proxy_http_version 1.1;
-		proxy_set_header Upgrade ${DOLLAR}http_upgrade;
-		proxy_set_header Connection "upgrade";
-	}
-}