Browse Source

Merge branch 'wip-https-portal' into 'master'

https-portal: upgrade from 1 to 1.2.4

Closes #24

See merge request main/securedrop-club!109
keep-around/3e0400fddc1d96281bed9154491b7fc6e94b1930
Loïc Dachary 3 years ago
parent
commit
e7b3f92b0d
  1. 3
      molecule/gitlab/roles/gitlab/tasks/gitlab.yml
  2. 3
      molecule/packages/roles/packages/tasks/packages.yml
  3. 3
      molecule/weblate/roles/weblate/templates/docker-compose-securedrop-club.yml
  4. 3
      molecule/website/roles/website/tasks/website.yml

3
molecule/gitlab/roles/gitlab/tasks/gitlab.yml

@ -95,7 +95,7 @@
- name: start https-portal
docker_container:
name: https-portal
image: steveltn/https-portal:1
image: steveltn/https-portal:1.2.4
restart_policy: always
ports:
- '80:80'
@ -104,4 +104,5 @@
CLIENT_MAX_BODY_SIZE: 0
DOMAINS: 'gitlab.{{ domain }} -> http://gitlab.{{ domain }}:8080, lab.{{ domain }} -> http://gitlab.{{ domain }}:8080'
STAGE: "{% if with_fake_LE is undefined %}production{% else %}staging{% endif %}"
SERVER_NAMES_HASH_BUCKET_SIZE: 64
state: "{% if with_https is defined and with_https == true %}started{% else %}absent{% endif %}"

3
molecule/packages/roles/packages/tasks/packages.yml

@ -160,7 +160,7 @@
- name: start https-portal
docker_container:
name: https-portal
image: steveltn/https-portal:1
image: steveltn/https-portal:1.2.4
restart_policy: always
ports:
- '80:80'
@ -168,4 +168,5 @@
env:
DOMAINS: '{{ packages_vhost_fqdn }} -> http://{{ packages_vhost_fqdn }}:8080'
STAGE: "{% if with_fake_LE is undefined %}production{% else %}staging{% endif %}"
SERVER_NAMES_HASH_BUCKET_SIZE: 128
state: "{% if with_https is defined and with_https == true %}started{% else %}absent{% endif %}"

3
molecule/weblate/roles/weblate/templates/docker-compose-securedrop-club.yml

@ -56,7 +56,7 @@ services:
restart: always
{% if with_https is defined and with_https == true %}
https-portal:
image: steveltn/https-portal:1
image: steveltn/https-portal:1.2.4
ports:
- '80:80'
- '443:443'
@ -66,6 +66,7 @@ services:
{% if with_fake_LE is undefined %}
STAGE: production
{% endif %}
SERVER_NAMES_HASH_BUCKET_SIZE: 128
{% endif %}
volumes:
weblate-data: {}

3
molecule/website/roles/website/tasks/website.yml

@ -104,7 +104,7 @@
- name: start https-portal
docker_container:
name: https-portal
image: steveltn/https-portal:1
image: steveltn/https-portal:1.2.4
restart_policy: always
ports:
- '80:80'
@ -112,4 +112,5 @@
env:
DOMAINS: '{{ website_vhost_fqdn }} -> http://{{ website_vhost_fqdn }}:8080, www.{{ website_vhost_fqdn }} -> http://{{ website_vhost_fqdn }}:8080'
STAGE: "{% if with_fake_LE is undefined %}production{% else %}staging{% endif %}"
SERVER_NAMES_HASH_BUCKET_SIZE: 128
state: "{% if with_https is defined and with_https == true %}started{% else %}absent{% endif %}"

Loading…
Cancel
Save