diff --git a/compose.yml b/compose.yml index db17372..32559ca 100644 --- a/compose.yml +++ b/compose.yml @@ -2,29 +2,6 @@ version: "3.8" services: - web: - image: nginx:1.20.0 - networks: - - proxy - - internal - environment: - - DISABLE_FEDERATION - - DOMAIN - - STACK_NAME - configs: - - source: nginx_config - target: /etc/nginx/nginx.conf - deploy: - restart_policy: - condition: on-failure - labels: - - "traefik.enable=true" - - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=80" - - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)" - - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure" - - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" - - "coop-cloud.${STACK_NAME}.version=0.1.0+v1.48.0" - app: image: "matrixdotorg/synapse:v1.48.0" volumes: @@ -45,6 +22,7 @@ services: - VIRTUAL_HOST=${DOMAIN} - VIRTUAL_PORT=8008 networks: + - proxy - internal entrypoint: /docker-entrypoint.sh configs: @@ -55,6 +33,16 @@ services: - source: entrypoint_conf target: /docker-entrypoint.sh mode: 0555 + deploy: + restart_policy: + condition: on-failure + labels: + - "traefik.enable=true" + - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=8008" + - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)" + - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure" + - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" + - "coop-cloud.${STACK_NAME}.version=0.1.0+v1.48.0" db: image: postgres:13-alpine @@ -90,10 +78,6 @@ configs: name: ${STACK_NAME}_homserver_yaml_${HOMESERVER_YAML_VERSION} file: homeserver.yaml.tmpl template_driver: golang - nginx_config: - name: ${STACK_NAME}_nginx_config_${NGINX_CONFIG_VERSION} - file: nginx.conf.tmpl - template_driver: golang log_config: name: ${STACK_NAME}_log_config_${LOG_CONFIG_VERSION} file: log.config.tmpl diff --git a/nginx.conf.tmpl b/nginx.conf.tmpl deleted file mode 100644 index e53b037..0000000 --- a/nginx.conf.tmpl +++ /dev/null @@ -1,26 +0,0 @@ -user www-data; - -events { - worker_connections 768; -} - -http { - upstream backend { - server {{ env "STACK_NAME" }}_app:8008; - } - - include /etc/nginx/mime.types; - - server { - listen 80 default_server; - server_name {{ env "DOMAIN" }}; - - location / { - proxy_pass http://backend; - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header Host $host; - client_max_body_size 50M; - } - } -}