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

Actualiza config de gitlab-ce

parent 8b5092e9

gitlab-ce/.env

+1 −2
Original line number Diff line number Diff line 
GITLAB_PROTOCOL=http

GITLAB_DOMAIN=redmic.net

GITLAB_SUBDOMAIN=git

GITLAB_REGISTRY_SUBDOMAIN=registry

GITLAB_SSH_PORT=2022

GITLAB_HTTP_PORT=2080

GITLAB_HTTPS_PORT=2443

GITLAB_UNICORN_PORT=8088

AWS_REGION=region

AWS_ACCESS_KEY_ID=id

AWS_SECRET_ACCESS_KEY=secret

gitlab-ce/docker-compose.dev.yml

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ services: 
      - target: 80

        published: ${GITLAB_HTTP_PORT}

        mode: host

      - target: 443

        published: ${GITLAB_HTTPS_PORT}

      - target: ${GITLAB_UNICORN_PORT}

        published: ${GITLAB_UNICORN_PORT}

        mode: host

    secrets:

      - source: authorized_keys_proxy

gitlab-ce/docker-compose.tmpl.yml

+3 −4
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ services: 
    hostname: ${GITLAB_SUBDOMAIN}.${GITLAB_DOMAIN}

    environment:

      GITLAB_OMNIBUS_CONFIG: |

        external_url '${GITLAB_PROTOCOL}://${GITLAB_SUBDOMAIN}.${GITLAB_DOMAIN}'

        external_url 'http://${GITLAB_SUBDOMAIN}.${GITLAB_DOMAIN}'

        registry_external_url 'http://${GITLAB_REGISTRY_SUBDOMAIN}.${GITLAB_DOMAIN}'

        gitlab_rails['registry_enabled'] = true

        gitlab_rails['backup_keep_time'] = 604800
@@ -17,7 +17,6 @@ services: 
           'aws_secret_access_key' => "${AWS_SECRET_ACCESS_KEY}"

        }

        gitlab_rails['backup_upload_remote_directory'] = 'gitlab.bkp'

        gitlab_rails['db_port'] = 5432

        gitlab_rails['smtp_enable'] = true

        gitlab_rails['smtp_address'] = "${SMTP_ADDR}"

        gitlab_rails['smtp_port'] = 25
@@ -26,7 +25,8 @@ services: 
        gitlab_rails['smtp_domain'] = "${SMTP_DOMAIN}"

        gitlab_rails['smtp_authentication'] = "plain"

        gitlab_rails['smtp_enable_starttls_auto'] = true

        unicorn['port'] = 8090

        gitlab_rails['smtp_tls'] = false

        unicorn['port'] = '${GITLAB_UNICORN_PORT}'

    networks:

      - gitlab-net

      - traefik-net
@@ -41,4 +41,3 @@ networks: 


  traefik-net:

    external: true