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

Setea valor de cookie para cluster, protege rest

parent b619b3b4

.gitlab-ci.yml

+16 −4
Original line number Diff line number Diff line
@@ -19,11 +19,14 @@ deploy-supporting-branch-develop: 
    SSH_REMOTE: ${DEV_SSH_REMOTE}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

    UI_AUTH: ${DEV_UI_AUTH}

    DOCKER_VERNEMQ_ALLOW_ANONYMOUS: ${DEV_DOCKER_VERNEMQ_ALLOW_ANONYMOUS}

    DOCKER_VERNEMQ_DISTRIBUTED_COOKIE: ${DEV_DOCKER_VERNEMQ_DISTRIBUTED_COOKIE}

  script:

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      DOCKER_VERNEMQ_ALLOW_ANONYMOUS=${DOCKER_VERNEMQ_ALLOW_ANONYMOUS}

      UI_AUTH=${UI_AUTH} DOCKER_VERNEMQ_ALLOW_ANONYMOUS=${DOCKER_VERNEMQ_ALLOW_ANONYMOUS}

      DOCKER_VERNEMQ_DISTRIBUTED_COOKIE=${DOCKER_VERNEMQ_DISTRIBUTED_COOKIE}

  environment:

    name: dev

  only:
@@ -38,11 +41,14 @@ deploy-stable-branch-develop: 
    SSH_REMOTE: ${DEV_SSH_REMOTE}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

    UI_AUTH: ${DEV_UI_AUTH}

    DOCKER_VERNEMQ_ALLOW_ANONYMOUS: ${DEV_DOCKER_VERNEMQ_ALLOW_ANONYMOUS}

    DOCKER_VERNEMQ_DISTRIBUTED_COOKIE: ${DEV_DOCKER_VERNEMQ_DISTRIBUTED_COOKIE}

  script:

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      DOCKER_VERNEMQ_ALLOW_ANONYMOUS=${DOCKER_VERNEMQ_ALLOW_ANONYMOUS}

      UI_AUTH=${UI_AUTH} DOCKER_VERNEMQ_ALLOW_ANONYMOUS=${DOCKER_VERNEMQ_ALLOW_ANONYMOUS}

      DOCKER_VERNEMQ_DISTRIBUTED_COOKIE=${DOCKER_VERNEMQ_DISTRIBUTED_COOKIE}

  environment:

    name: dev

  only:
@@ -55,11 +61,14 @@ deploy-supporting-branch-production: 
    SSH_REMOTE: ${PRO_SSH_REMOTE}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

    UI_AUTH: ${PRO_UI_AUTH}

    DOCKER_VERNEMQ_ALLOW_ANONYMOUS: ${PRO_DOCKER_VERNEMQ_ALLOW_ANONYMOUS}

    DOCKER_VERNEMQ_DISTRIBUTED_COOKIE: ${PRO_DOCKER_VERNEMQ_DISTRIBUTED_COOKIE}

  script:

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      DOCKER_VERNEMQ_ALLOW_ANONYMOUS=${DOCKER_VERNEMQ_ALLOW_ANONYMOUS}

      UI_AUTH=${UI_AUTH} DOCKER_VERNEMQ_ALLOW_ANONYMOUS=${DOCKER_VERNEMQ_ALLOW_ANONYMOUS}

      DOCKER_VERNEMQ_DISTRIBUTED_COOKIE=${DOCKER_VERNEMQ_DISTRIBUTED_COOKIE}

  environment:

    name: pro

  only:
@@ -74,11 +83,14 @@ deploy-stable-branch-production: 
    SSH_REMOTE: ${PRO_SSH_REMOTE}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

    UI_AUTH: ${PRO_UI_AUTH}

    DOCKER_VERNEMQ_ALLOW_ANONYMOUS: ${PRO_DOCKER_VERNEMQ_ALLOW_ANONYMOUS}

    DOCKER_VERNEMQ_DISTRIBUTED_COOKIE: ${PRO_DOCKER_VERNEMQ_DISTRIBUTED_COOKIE}

  script:

    - >

      deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      DOCKER_VERNEMQ_ALLOW_ANONYMOUS=${DOCKER_VERNEMQ_ALLOW_ANONYMOUS}

      UI_AUTH=${UI_AUTH} DOCKER_VERNEMQ_ALLOW_ANONYMOUS=${DOCKER_VERNEMQ_ALLOW_ANONYMOUS}

      DOCKER_VERNEMQ_DISTRIBUTED_COOKIE=${DOCKER_VERNEMQ_DISTRIBUTED_COOKIE}

  environment:

    name: pro

  only:

deploy/.env

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ SUBDOMAIN=mqtt 
DOCKER_VERNEMQ_ALLOW_ANONYMOUS=off

DOCKER_VERNEMQ_LISTENER__HTTP__DEFAULT=127.0.0.1:8889

DOCKER_IP_ADDRESS=0.0.0.0

DOCKER_VERNEMQ_DISTRIBUTED_COOKIE=changeme

DOCKER_VERNEMQ_PLUGINS__VMQ_PASSWD=off

DOCKER_VERNEMQ_PLUGINS__VMQ_ACL=off

DOCKER_VERNEMQ_PLUGINS__VMQ_DIVERSITY=on

deploy/docker-compose.tmpl.yml

+3 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ services: 
      - DOCKER_VERNEMQ_ALLOW_ANONYMOUS

      - DOCKER_VERNEMQ_LISTENER__HTTP__DEFAULT

      - DOCKER_IP_ADDRESS

      - DOCKER_VERNEMQ_DISTRIBUTED_COOKIE

      - DOCKER_VERNEMQ_PLUGINS__VMQ_PASSWD

      - DOCKER_VERNEMQ_PLUGINS__VMQ_ACL

      - DOCKER_VERNEMQ_PLUGINS__VMQ_DIVERSITY
@@ -34,6 +35,7 @@ services: 
      replicas: 1

      labels:

        traefik.websocket.frontend.rule: Host:${SUBDOMAIN}.${PUBLIC_HOSTNAME}

        traefik.metrics.frontend.auth.basic.users: ${UI_AUTH}

        traefik.metrics.frontend.rule: Host:${SUBDOMAIN}.${PUBLIC_HOSTNAME};Path:/metrics

        traefik.backend: vernemq

        traefik.websocket.port: '8080'
@@ -66,7 +68,7 @@ services: 
          cpus: '0.1'

          memory: 64M

        reservations:

          memory: 52M

          memory: 32M



networks:

  vernemq-net: