Commit 31829660 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Pone al día el proyecto y permite relocalizar

See merge request redmic-project/gateway/certificates-manager!17
parents 4edc3f2e 7b37711c

.gitlab-ci.yml

+2 −2
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'

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

    ref: master

    file: '/maintenance.yml'

    file: '/deployment-service/maintenance.yml'



stages:

  - deploy

README.md

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ También se pueden definir opcionalmente las siguientes variables de entorno: 


| Variable | Descripción | Valor por defecto |

|:-:|:-:|:-:|

| DH_NUMBITS | Complejidad de los parámetros DH generados para el servidor web. Reducir el tamaño acelerará los cálculos. | `4096` |

| DH_NUMBITS | Complejidad de los parámetros DH generados para el servidor web. Reducir el tamaño acelerará los cálculos. | `2048` |

| SERVER_SERVICE | Nombre del servicio (*Docker Swarm*, `<stack>_<service-name>`) del servidor web. | `gateway_nginx-proxy-https` |

| PUSHGATEWAY_HOST | Dirección del servicio Pushgateway al que se enviarán las métricas Prometheus de monitorización. | `pushgateway:9091` |

| DHPARAMS_VOL_NAME | Nombre del volumen Docker donde se almacenan los parámetros DH generados, si no existen ya allí (se montará sobre `/dhparams`). | `dhparams-vol` |

deploy/.env

+6 −4
Original line number Diff line number Diff line 
DH_NUMBITS=4096

DH_NUMBITS=2048

SERVER_SERVICE=gateway_nginx-proxy-https

PUSHGATEWAY_HOST=pushgateway:9091
@@ -7,8 +7,10 @@ CERTBOT_CONFIG_VOL_NAME=certbot-config-vol 
CERTBOT_LOGS_VOL_NAME=certbot-logs-vol

ACME_VOL_NAME=acme-vol



VOL_TYPE=nfs4

DEV_VOL_DRIVER=local

VOL_TYPE=nfs

VOL_ADDR=127.0.0.1

VOL_OPTIONS=rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14

VOL_VERS=4.2

VOL_OPTS=nolock,noacl,noatime,nodiratime



AWS_REGION=eu-west-1
 
PRO_VOL_DRIVER=cloudstor:aws

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

+24 −0
Original line number Diff line number Diff line 
version: '3.5'



volumes:

  dhparams-vol:

    name: ${DHPARAMS_VOL_NAME}

    driver: local

    driver: ${DEV_VOL_DRIVER}

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTIONS}

      device: ${DHPARAMS_VOL_DEVICE:-:/dhparams-vol/}

      o: addr=${VOL_ADDR},vers=${VOL_VERS},${VOL_OPTS}

      device: :${VOL_DEVICE_PREFIX}${DHPARAMS_VOL_DEVICE:-/dhparams-vol/}



  config-vol:

    name: ${CERTBOT_CONFIG_VOL_NAME}

    driver: local

    driver: ${DEV_VOL_DRIVER}

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTIONS}

      device: ${CERTBOT_CONFIG_VOL_DEVICE:-:/certbot-config-vol/}

      o: addr=${VOL_ADDR},vers=${VOL_VERS},${VOL_OPTS}

      device: :${VOL_DEVICE_PREFIX}${CERTBOT_CONFIG_VOL_DEVICE:-/certbot-config-vol/}



  acme-vol:

    name: ${ACME_VOL_NAME}

    driver: local

    driver: ${DEV_VOL_DRIVER}

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTIONS}

      device: ${ACME_VOL_DEVICE:-:/acme-vol/}
 
      o: addr=${VOL_ADDR},vers=${VOL_VERS},${VOL_OPTS}

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

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

+18 −0
Original line number Diff line number Diff line 
version: '3.5'



services:

  certificates-manager:

    deploy:

      placement:

        constraints:

          - engine.labels.availability_zone == ${AWS_REGION}a



volumes:

  dhparams-vol:

    name: ${DHPARAMS_VOL_NAME}

    driver: ${PRO_VOL_DRIVER}

    driver_opts:

      backing: shared



  config-vol:

    name: ${CERTBOT_CONFIG_VOL_NAME}

    driver: ${PRO_VOL_DRIVER}

    driver_opts:

      backing: shared



  acme-vol:

    name: ${ACME_VOL_NAME}

    driver: ${PRO_VOL_DRIVER}

    driver_opts:

      backing: shared