Skip to content
Snippets Groups Projects
Commit 37de78ca authored by jurgenhaas's avatar jurgenhaas
Browse files
- add support for basic auth
parent 0cf40d50
No related branches found
Tags v3.6.6
No related merge requests found
......@@ -36,6 +36,12 @@ class Handler extends BaseHandler {
$options = [
'projectname' => $projectname,
'staging' => FALSE,
'basicauth' => [
'enabled' => FALSE,
'user' => ',',
'pass' => ',',
'code' => ',',
],
'ci_home' => '/home/gitlab-runner',
'docker0' => [
'ip' => ($this->isCiContext() || $this->isLocalDevMode()) ?
......@@ -231,6 +237,12 @@ class Handler extends BaseHandler {
'projectprotocol' => 'https',
'projectport' => '',
'extradomains' => $config->readValue('aliases'),
'basicauth' => [
'enabled' => (getenv('BASIC_AUTH') === 'yes'),
'user' => getenv('BASIC_AUTH_USER'),
'pass' => getenv('BASIC_AUTH_PASS'),
'code' => getenv('BASIC_AUTH_CODE'),
],
];
foreach ($overwriteConfig as $key => $value) {
$this->config->setValue($key, $value, FALSE);
......
......@@ -129,6 +129,10 @@ services:
labels:
traefik.enable: 'true'
traefik.docker.network: traefik-public
{% if basicauth.enabled %}
traefik.http.middlewares.{{ webserver.type }}-{{ projectname }}-auth.basicauth.users: {{ basicauth.code }}
traefik.http.routers.{{ webserver.type }}-{{ projectname }}.middlewares: {{ webserver.type }}-{{ projectname }}-auth@docker
{% endif %}
traefik.http.routers.{{ webserver.type }}-{{ projectname }}.rule: Host(`{{ projectdomain }}`){% for domain in extradomains|default([]) %} || Host(`{{ domain }}`){% endfor %}
{% if varnish.enable %}
......@@ -231,6 +235,10 @@ services:
labels:
traefik.enable: 'true'
traefik.docker.network: traefik-public
{% if basicauth.enabled %}
traefik.http.middlewares.mailhog-{{ projectname }}-auth.basicauth.users: {{ basicauth.code }}
traefik.http.routers.mailhog-{{ projectname }}.middlewares: mailhog-{{ projectname }}-auth@docker
{% endif %}
traefik.http.services.{{ projectname }}_mailhog.loadbalancer.server.port: 8025
traefik.http.routers.mailhog-{{ projectname }}.rule: Host(`mailhog-{{ projectdomain }}`)
{% endif %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment