diff --git a/.gitignore b/.gitignore
index 30551d9..3b2653d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/defaults/main.yml b/defaults/main.yml
index 9547380..e5b7b95 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -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
diff --git a/tasks/main.yml b/tasks/main.yml
index ed6a6b5..03848d1 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -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:
diff --git a/templates/sympa.conf.j2 b/templates/sympa.conf.j2
index 241826a..3dea6f0 100644
--- a/templates/sympa.conf.j2
+++ b/templates/sympa.conf.j2
@@ -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