Disable HTTPS for gitlab application
As it is behind a reverse proxy doing this already
This commit is contained in:
parent
aa3298fd78
commit
2d50298ae4
1 changed files with 3 additions and 2 deletions
|
|
@ -7,6 +7,8 @@ services:
|
||||||
environment:
|
environment:
|
||||||
GITLAB_OMNIBUS_CONFIG: |
|
GITLAB_OMNIBUS_CONFIG: |
|
||||||
external_url 'https://{{ hostname }}'
|
external_url 'https://{{ hostname }}'
|
||||||
|
nginx['listen_port'] = 80
|
||||||
|
nginx['listen_https'] = false
|
||||||
gitlab_rails['gitlab_email_enabled'] = true
|
gitlab_rails['gitlab_email_enabled'] = true
|
||||||
gitlab_rails['gitlab_email_from'] = '{{ smtp_username }}'
|
gitlab_rails['gitlab_email_from'] = '{{ smtp_username }}'
|
||||||
gitlab_rails['gitlab_email_display_name'] = 'Gitlab'
|
gitlab_rails['gitlab_email_display_name'] = 'Gitlab'
|
||||||
|
|
@ -22,7 +24,6 @@ services:
|
||||||
user['git_user_email'] = '{{ smtp_username }}'
|
user['git_user_email'] = '{{ smtp_username }}'
|
||||||
ports:
|
ports:
|
||||||
- '9090:80'
|
- '9090:80'
|
||||||
- '9093:443'
|
|
||||||
- '22:22'
|
- '22:22'
|
||||||
volumes:
|
volumes:
|
||||||
- '$GITLAB_HOME/config:/etc/gitlab'
|
- '$GITLAB_HOME/config:/etc/gitlab'
|
||||||
|
|
@ -33,7 +34,7 @@ services:
|
||||||
image: 'gitlab/gitlab-runner:{{ runner_image_tag }}'
|
image: 'gitlab/gitlab-runner:{{ runner_image_tag }}'
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
environment:
|
environment:
|
||||||
CI_SERVER_URL: "https://{{ hostname }}"
|
CI_SERVER_URL: "http://web"
|
||||||
depends_on:
|
depends_on:
|
||||||
- web
|
- web
|
||||||
volumes:
|
volumes:
|
||||||
|
|
|
||||||
Reference in a new issue