Skip to content
Permalink
Browse files

Merge branch 'drybjed-fix-dovecot-template'

  • Loading branch information...
drybjed committed Sep 17, 2019
2 parents 6420179 + 5381dad commit 726ddb70e2a448d3abf3d6c8964706dbd185d37b
Showing with 4 additions and 4 deletions.
  1. +3 −3 .gitlab-ci.yml
  2. +1 −1 ansible/roles/debops.dovecot/templates/etc/dovecot/conf.d/10-ssl.conf.j2
@@ -421,9 +421,9 @@ stages:
<<: *test_role_3rd_deps
variables:
JANE_TEST_FACT: 'dovecot.fact'
JANE_TEST_PLAY: '${DEBOPS_PLAYBOOKS}/service/dovecot.yml'
JANE_INVENTORY_GROUPS: 'debops_service_dovecot'
JANE_INVENTORY_HOSTVARS: 'dovecot_pki=false'
JANE_TEST_PLAY: '${DEBOPS_PLAYBOOKS}/service/pki.yml ${DEBOPS_PLAYBOOKS}/service/dovecot.yml'
JANE_INVENTORY_GROUPS: 'debops_service_pki,debops_service_dovecot'
JANE_INVENTORY_HOSTVARS: 'dovecot'
JANE_DIFF_PATTERN: '.*/debops.dovecot/.*'
JANE_LOG_PATTERN: '\[debops\.dovecot\]'

@@ -28,7 +28,7 @@ ssl_dh_parameters_length = {{ dovecot_ssl_dh_parameters_length }}
{% set dovecot_tpl_tls_key_file = dovecot_pki_path + "/" + dovecot_pki_realm + "/" + dovecot_pki_key %}
ssl_cert = <{{ dovecot_tpl_tls_cert_file }}
ssl_key = <{{ dovecot_tpl_tls_key_file }}
{% if (ansible_distribution_release in [ "wheezy", "jessie", "precise", "trusty" ] %}
{% if ansible_distribution_release in [ "wheezy", "jessie", "precise", "trusty" ] %}
ssl_protocols = {{ dovecot_ssl_protocols }}
{% else %}
ssl_min_protocol = {{ dovecot_ssl_protocols }}

0 comments on commit 726ddb7

Please sign in to comment.
You can’t perform that action at this time.