Commit 4c68fbd7 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Descarta redirección, corrige acceso a well-known

See merge request redmic-project/gateway/nginx-proxy-http!14
parents e490bf2e dbdb86a8

deploy/.env

+0 −2
Original line number Diff line number Diff line
@@ -4,5 +4,3 @@ PORT_MODE=host 


AWS_REGION=eu-west-1

ACME_VOL_NAME=acme-vol
 


REDIRECT_REDMIC_CONFIG_NAME=nginx-proxy-http-redirect-redmic-config

deploy/compose.dev.yaml

+0 −5
Original line number Diff line number Diff line
@@ -13,8 +13,3 @@ volumes: 
      type: ${VOL_TYPE:-nfs}

      o: addr=${VOL_ADDR:-127.0.0.1},vers=${VOL_VERS:-4.2},${VOL_OPTS:-nolock,noacl,noatime,nodiratime}

      device: :${VOL_DEVICE_PREFIX}${ACME_VOL_DEVICE:-/acme-vol/}
 


configs:

  redirect-redmic-config:

    name: ${REDIRECT_REDMIC_CONFIG_NAME}

    file: ./config/dev-redirect-redmic.conf

deploy/compose.prod.yaml

+0 −5
Original line number Diff line number Diff line
@@ -8,8 +8,3 @@ services: 
volumes:

  acme-vol:

    name: ${ACME_VOL_NAME}
 


configs:

  redirect-redmic-config:

    name: ${REDIRECT_REDMIC_CONFIG_NAME}

    file: ./config/pro-redirect-redmic.conf

deploy/compose.tmpl.yaml

+0 −8
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ services: 
    configs:

      - source: default-config

        target: /etc/nginx/conf.d/default.conf

      - source: redirect-redmic-config

        target: /etc/nginx/conf.d/redirect-redmic.conf

      - source: redirect-ecomarcan-config

        target: /etc/nginx/conf.d/redirect-ecomarcan.conf

    healthcheck:

      test: wget --spider -q http://localhost/nginx-health

      interval: ${HEALTHCHECK_INTERVAL:-30s}
@@ -50,7 +46,3 @@ configs: 
  default-config:

    name: ${DEFAULT_CONFIG_NAME:-nginx-proxy-http-default-config}

    file: ./config/default.conf
 


  redirect-ecomarcan-config:

    name: ${REDIRECT_ECOMARCAN_CONFIG_NAME:-nginx-proxy-http-redirect-ecomarcan-config}

    file: ./config/redirect-ecomarcan.conf

deploy/config/dev-redirect-redmic.conf

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
server {

	listen [::]:80;

	listen 80;



	access_log off;

	server_tokens off;



	server_name ~^(es\.|en\.|api\.)?redmic(\.grafcan\.es)$;

	return 301 https://$1ecomarcan$2$request_uri;

}