Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

First fixes of issue #2, for upstream PR #9

Merged
merged 1 commit into from
Feb 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,7 @@ pyvenv.cfg
.venv
pip-selfcheck.json

# Exclude this file automatically created or modified by `ansible-galaxy install`
meta/.galaxy_install_info

# End of https://www.gitignore.io/api/ansible,linux,vim,virtualenv,git
12 changes: 7 additions & 5 deletions defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
---
sympa_show_default_templates: false
sympa_template_lists: []
sympa_ldap_alias_manager_conf:
mail_attribute: mailRoutingAddress
ssl: true
queue_transport: sympa
bouncequeue_transport: sympabounce
## Define the following variables for ldap alias manager
# sympa_ldap_alias_manager_conf:
# host: ldap.myhost.org
# mail_attribute: mailRoutingAddress
# ssl: true
# queue_transport: sympa
# bouncequeue_transport: sympabounce
sympa_db_name: sympa
sympa_db_host: localhost
sympa_db_port: 3306
Expand Down
3 changes: 2 additions & 1 deletion tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,12 @@
- name: Create datasources
copy:
content: "{{ item.content }}"
dest: "/etc/sympa/data_sources/{{ item.name}}.incl"
dest: "/etc/sympa/data_sources/{{ item.name }}.incl"
owner: sympa
group: sympa
mode: 0600
loop: "{{ sympa_data_sources }}"
when: sympa_data_sources is defined

- name: Create auth.conf
template:
Expand Down
2 changes: 1 addition & 1 deletion templates/sympa.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ dkim_signer_domain {{ sympa_dkim_signer_domain }}
## dkim_selector
## The selector
{% if sympa_dkim_selector is defined %}
dkim_selector
dkim_selector {{ sympa_dkim_selector }}
{% endif %}

## dkim_signer_identity
Expand Down