diff options
| author | Guilhem Moulin <guilhem@fripost.org> | 2014-07-13 23:13:14 +0200 |
|---|---|---|
| committer | Guilhem Moulin <guilhem@fripost.org> | 2015-06-07 02:53:06 +0200 |
| commit | fc3b951c202cfea5c1f548655cf92f34c22801e4 (patch) | |
| tree | 8175de975f624eee7e8e2e0ba23ada3a79340a0f | |
| parent | 4fb4be4d279dd94cab33fc778cfa318b93d6926f (diff) | |
wibble
| -rw-r--r-- | roles/common-LDAP/templates/etc/ldap/database.ldif.j2 | 12 | ||||
| -rw-r--r-- | roles/common/tasks/samhain.yml | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/roles/common-LDAP/templates/etc/ldap/database.ldif.j2 b/roles/common-LDAP/templates/etc/ldap/database.ldif.j2 index b1db0f5..e19d182 100644 --- a/roles/common-LDAP/templates/etc/ldap/database.ldif.j2 +++ b/roles/common-LDAP/templates/etc/ldap/database.ldif.j2 @@ -282,12 +282,12 @@ olcAccess: to dn.exact="ou=virtual,dc=fripost,dc=org" attrs=entry,objectClass filter=(objectClass=FripostVirtual) {% if 'MDA' in group_names -%} - by dn.exact="username=dovecot,cn=peercred,cn=external,cn=auth" sockurl.regex="^ldapi://" =sd + by dn.exact="username=dovecot,cn=peercred,cn=external,cn=auth" sockurl.regex="^ldapi://" =sd {% endif -%} {% if 'MX' in group_names -%} - by dn.exact="cn=postfix,ou=services,dc=fripost,dc=org" sockurl.regex="^ldapi://%2Fvar%2Fspool%2Fpostfix-[-[:alnum:]]+%2Fprivate%2F" =sd + by dn.exact="cn=postfix,ou=services,dc=fripost,dc=org" sockurl.regex="^ldapi://%2Fvar%2Fspool%2Fpostfix-[-[:alnum:]]+%2Fprivate%2F" =sd {% endif -%} - by users =0 break + by users =0 break # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # Domain entries @@ -353,12 +353,12 @@ olcAccess: to dn.regex="^fvd=[^,]+,ou=virtual,dc=fripost,dc=org$" attrs=fripostOwner,fripostPostmaster filter=(&(objectClass=FripostVirtualDomain)(!(objectClass=FripostPendingEntry))) {% if 'LDAP-provider' in group_names and groups.MX | difference([inventory_hostname]) -%} - by dn.exact="cn=mX,ou=syncRepl,dc=fripost,dc=org" tls_ssf=128 =rsd + by dn.exact="cn=mX,ou=syncRepl,dc=fripost,dc=org" tls_ssf=128 =rsd {% endif -%} {% if 'MX' in group_names %} - by dn.exact="username=nobody,cn=peercred,cn=external,cn=auth" sockurl.regex="^ldapi://" =rsd + by dn.exact="username=nobody,cn=peercred,cn=external,cn=auth" sockurl.regex="^ldapi://" =rsd {% endif -%} - by users =0 break + by users =0 break # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # Alias domain entries diff --git a/roles/common/tasks/samhain.yml b/roles/common/tasks/samhain.yml index 10b1f46..184decc 100644 --- a/roles/common/tasks/samhain.yml +++ b/roles/common/tasks/samhain.yml @@ -7,11 +7,11 @@ # Every once in a while, or after a major upgrade, you may want to # update Samhain's database: # - # sudo samhain -t update --foreground + # sudo samhain -t update --foreground -l none # - # To update the database without sending mails: + # To update the database interactively, without sending mails: # - # sudo samhain -t update --foreground -m none + # sudo samhain -t update --interactive -l none -m none - name: Configure samhain copy: src=etc/samhain/samhainrc |