Commit 7e849771 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Elimina recursos de bloqueo

See merge request redmic-project/gateway/nginx-proxy-https!18
parents b22f4192 a8ceae2e

.gitlab-ci.yml

+1 −3
Original line number Diff line number Diff line 
include:

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment.yml'

    file: '/deployment-service/docker-deploy.yml'



stages:

  - deploy
@@ -9,5 +9,3 @@ stages: 
.deploy:

  variables:

    STACK: gateway
 
  environment:

    url: https://${PUBLIC_HOSTNAME}

deploy/.env

+3 −1
Original line number Diff line number Diff line 
HTTPS_INTERNAL_PORT=443

HTTPS_PORT=443

PORT_MODE=host

BLACKLIST_CONFIG_NAME=nginx-blacklist



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



AWS_REGION=eu-west-1

deploy/docker-compose.dev.yml→deploy/compose.dev.yaml

+3 −5
Original line number Diff line number Diff line 
version: '3.5'



services:

  nginx-proxy-https:

    deploy:
@@ -8,6 +6,6 @@ services: 
          - node.labels.${PLACEMENT_CONSTRAINTS_NODE_LABELS_NAME:-gateway} == ${PLACEMENT_CONSTRAINTS_NODE_LABELS_VALUE:-true}



configs:

  blacklist-config:

    name: ${BLACKLIST_CONFIG_NAME}

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

    name: ${REDIRECT_REDMIC_CONFIG_NAME}

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

deploy/docker-compose.prod.yml→deploy/compose.prod.yaml

+3 −5
Original line number Diff line number Diff line 
version: '3.5'



services:

  nginx-proxy-https:

    deploy:
@@ -8,6 +6,6 @@ services: 
          - engine.labels.availability_zone == ${AWS_REGION}a



configs:

  blacklist-config:

    name: ${BLACKLIST_CONFIG_NAME}

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

    name: ${REDIRECT_REDMIC_CONFIG_NAME}

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

deploy/docker-compose.tmpl.yml→deploy/compose.tmpl.yaml

+7 −15
Original line number Diff line number Diff line 
version: '3.5'



services:

  nginx-proxy-https:

    image: ${IMAGE_NAME:-nginx}:${IMAGE_TAG:-alpine}
@@ -20,12 +18,10 @@ services: 
        target: /etc/nginx/conf.d/ssl-params.conf

      - source: ssl-certs-config

        target: /etc/nginx/conf.d/ssl-certs.conf

      - source: blockips-config

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

      - source: blacklist-config

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

      - source: block-requests-config

        target: /etc/nginx/snippets/block-bad-request.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

    secrets:

      - source: cert-chain-secret

        target: /etc/nginx/certs/chain.pem
@@ -85,13 +81,9 @@ configs: 
    name: ${NGINX_SSL_CERTS_CONFIG_NAME:-nginx-proxy-https-ssl-certs-config}

    file: ./config/conf.d/ssl-certs.conf



  blockips-config:

    name: ${BLOCKIPS_CONFIG_NAME:-nginx-blockips}

    file: ./config/conf.d/blockips.conf



  block-requests-config:

    name: ${NGINX_BLOCK_REQUESTS_CONFIG_NAME:-nginx-proxy-https-block-requests-config}

    file: ./config/snippets/block-bad-request.conf

  redirect-ecomarcan-config:

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

    file: ./config/conf.d/redirect-ecomarcan.conf



secrets:

  cert-chain-secret: