From 6bc4a45c979f4b9b34cb7aff60194ab5dd4005ad Mon Sep 17 00:00:00 2001 From: polarathene <5098581+polarathene@users.noreply.github.com> Date: Mon, 4 Sep 2023 19:22:52 +1200 Subject: [PATCH] fix: New template files accidentally committed with `CRLF` line endings These files were created on Windows, linter caught the discrepancy. Now they're `LF`. --- target/features/ldap/dovecot.base | 18 ++++---- target/features/ldap/dovecot.tmpl | 64 ++++++++++++------------- target/features/ldap/postfix.base | 14 +++--- target/features/ldap/postfix.tmpl | 70 ++++++++++++++-------------- target/features/ldap/saslauthd.base | 12 ++--- target/features/ldap/saslauthd.tmpl | 72 ++++++++++++++--------------- 6 files changed, 125 insertions(+), 125 deletions(-) diff --git a/target/features/ldap/dovecot.base b/target/features/ldap/dovecot.base index 3ef4e15c..5d904cde 100644 --- a/target/features/ldap/dovecot.base +++ b/target/features/ldap/dovecot.base @@ -1,9 +1,9 @@ -dn = ${BIND_DN} -dnpass = ${BIND_PW} -uris = ${SERVER_HOST} -base = ${SEARCH_BASE} -default_pass_scheme = SSHA -pass_attrs = uniqueIdentifier=user,userPassword=password -pass_filter = (&(objectClass=PostfixBookMailAccount)(uniqueIdentifier=%n)) -user_attrs = mailHomeDirectory=home,mailUidNumber=uid,mailGidNumber=gid,mailStorageDirectory=mail -user_filter = (&(objectClass=PostfixBookMailAccount)(uniqueIdentifier=%n)) +dn = ${BIND_DN} +dnpass = ${BIND_PW} +uris = ${SERVER_HOST} +base = ${SEARCH_BASE} +default_pass_scheme = SSHA +pass_attrs = uniqueIdentifier=user,userPassword=password +pass_filter = (&(objectClass=PostfixBookMailAccount)(uniqueIdentifier=%n)) +user_attrs = mailHomeDirectory=home,mailUidNumber=uid,mailGidNumber=gid,mailStorageDirectory=mail +user_filter = (&(objectClass=PostfixBookMailAccount)(uniqueIdentifier=%n)) diff --git a/target/features/ldap/dovecot.tmpl b/target/features/ldap/dovecot.tmpl index a44ee80e..0be048b8 100644 --- a/target/features/ldap/dovecot.tmpl +++ b/target/features/ldap/dovecot.tmpl @@ -1,32 +1,32 @@ -# Dovecot LDAP config docs: https://github.com/dovecot/core/blob/bbb600e46ca650a3a5ef812ea3a1e8c45a6ea0ba/doc/example-config/dovecot-ldap.conf.ext -hosts = ${HOSTS} -uris = ${URIS} -dn = ${DN} -dnpass = ${DNPASS} -sasl_bind = ${SASL_BIND} -sasl_mech = ${SASL_MECH} -sasl_realm = ${SASL_REALM} -sasl_authz_id = ${SASL_AUTHZ_ID} -tls = ${TLS} -tls_ca_cert_file = ${TLS_CA_CERT_FILE} -tls_ca_cert_dir = ${TLS_CA_CERT_DIR} -tls_cipher_suite = ${TLS_CIPHER_SUITE} -tls_cert_file = ${TLS_CERT_FILE} -tls_key_file = ${TLS_KEY_FILE} -tls_require_cert = ${TLS_REQUIRE_CERT} -ldaprc_path = ${LDAPRC_PATH} -debug_level = ${DEBUG_LEVEL} -auth_bind = ${AUTH_BIND} -auth_bind_userdn = ${AUTH_BIND_USERDN} -ldap_version = ${LDAP_VERSION} -base = ${BASE} -deref = ${DEREF} -scope = ${SCOPE} -user_attrs = ${USER_ATTRS} -user_filter = ${USER_FILTER} -pass_attrs = ${PASS_ATTRS} -pass_filter = ${PASS_FILTER} -iterate_attrs = ${ITERATE_ATTRS} -iterate_filter = ${ITERATE_FILTER} -default_pass_scheme = ${DEFAULT_PASS_SCHEME} -blocking = ${BLOCKING} +# Dovecot LDAP config docs: https://github.com/dovecot/core/blob/bbb600e46ca650a3a5ef812ea3a1e8c45a6ea0ba/doc/example-config/dovecot-ldap.conf.ext +hosts = ${HOSTS} +uris = ${URIS} +dn = ${DN} +dnpass = ${DNPASS} +sasl_bind = ${SASL_BIND} +sasl_mech = ${SASL_MECH} +sasl_realm = ${SASL_REALM} +sasl_authz_id = ${SASL_AUTHZ_ID} +tls = ${TLS} +tls_ca_cert_file = ${TLS_CA_CERT_FILE} +tls_ca_cert_dir = ${TLS_CA_CERT_DIR} +tls_cipher_suite = ${TLS_CIPHER_SUITE} +tls_cert_file = ${TLS_CERT_FILE} +tls_key_file = ${TLS_KEY_FILE} +tls_require_cert = ${TLS_REQUIRE_CERT} +ldaprc_path = ${LDAPRC_PATH} +debug_level = ${DEBUG_LEVEL} +auth_bind = ${AUTH_BIND} +auth_bind_userdn = ${AUTH_BIND_USERDN} +ldap_version = ${LDAP_VERSION} +base = ${BASE} +deref = ${DEREF} +scope = ${SCOPE} +user_attrs = ${USER_ATTRS} +user_filter = ${USER_FILTER} +pass_attrs = ${PASS_ATTRS} +pass_filter = ${PASS_FILTER} +iterate_attrs = ${ITERATE_ATTRS} +iterate_filter = ${ITERATE_FILTER} +default_pass_scheme = ${DEFAULT_PASS_SCHEME} +blocking = ${BLOCKING} diff --git a/target/features/ldap/postfix.base b/target/features/ldap/postfix.base index 72bbee08..68e203ef 100644 --- a/target/features/ldap/postfix.base +++ b/target/features/ldap/postfix.base @@ -1,7 +1,7 @@ -bind_dn = ${BIND_DN} -bind_pw = ${BIND_PW} -server_host = ${SERVER_HOST} -search_base = ${SEARCH_BASE} -bind = yes -result_attribute = mail -version = 3 +bind_dn = ${BIND_DN} +bind_pw = ${BIND_PW} +server_host = ${SERVER_HOST} +search_base = ${SEARCH_BASE} +bind = yes +result_attribute = mail +version = 3 diff --git a/target/features/ldap/postfix.tmpl b/target/features/ldap/postfix.tmpl index 682d8e27..86de2f33 100644 --- a/target/features/ldap/postfix.tmpl +++ b/target/features/ldap/postfix.tmpl @@ -1,35 +1,35 @@ -# Postfix LDAP table docs: http://www.postfix.org/ldap_table.5.html -server_host = ${SERVER_HOST} -server_port = ${SERVER_PORT} -timeout = ${TIMEOUT} -search_base = ${SEARCH_BASE} -query_filter = ${QUERY_FILTER} -result_format = ${RESULT_FORMAT} -domain = ${DOMAIN} -result_attribute = ${RESULT_ATTRIBUTE} -special_result_attribute = ${SPECIAL_RESULT_ATTRIBUTE} -terminal_result_attribute = ${TERMINAL_RESULT_ATTRIBUTE} -leaf_result_attribute = ${LEAF_RESULT_ATTRIBUTE} -scope = ${SCOPE} -bind = ${BIND} -bind_dn = ${BIND_DN} -bind_pw = ${BIND_PW} -recursion_limit = ${RECURSION_LIMIT} -expansion_limit = ${EXPANSION_LIMIT} -size_limit = ${SIZE_LIMIT} -dereference = ${DEREFERENCE} -chase_referrals = ${CHASE_REFERRALS} -version = ${VERSION} -debuglevel = ${DEBUGLEVEL} -sasl_mechs = ${SASL_MECHS} -sasl_realm = ${SASL_REALM} -sasl_authz_id = ${SASL_AUTHZ_ID} -sasl_minssf = ${SASL_MINSSF} -start_tls = ${START_TLS} -tls_ca_cert_dir = ${TLS_CA_CERT_DIR} -tls_ca_cert_file = ${TLS_CA_CERT_FILE} -tls_cert = ${TLS_CERT} -tls_key = ${TLS_KEY} -tls_require_cert = ${TLS_REQUIRE_CERT} -tls_random_file = ${TLS_RANDOM_FILE} -tls_cipher_suite = ${TLS_CIPHER_SUITE} +# Postfix LDAP table docs: http://www.postfix.org/ldap_table.5.html +server_host = ${SERVER_HOST} +server_port = ${SERVER_PORT} +timeout = ${TIMEOUT} +search_base = ${SEARCH_BASE} +query_filter = ${QUERY_FILTER} +result_format = ${RESULT_FORMAT} +domain = ${DOMAIN} +result_attribute = ${RESULT_ATTRIBUTE} +special_result_attribute = ${SPECIAL_RESULT_ATTRIBUTE} +terminal_result_attribute = ${TERMINAL_RESULT_ATTRIBUTE} +leaf_result_attribute = ${LEAF_RESULT_ATTRIBUTE} +scope = ${SCOPE} +bind = ${BIND} +bind_dn = ${BIND_DN} +bind_pw = ${BIND_PW} +recursion_limit = ${RECURSION_LIMIT} +expansion_limit = ${EXPANSION_LIMIT} +size_limit = ${SIZE_LIMIT} +dereference = ${DEREFERENCE} +chase_referrals = ${CHASE_REFERRALS} +version = ${VERSION} +debuglevel = ${DEBUGLEVEL} +sasl_mechs = ${SASL_MECHS} +sasl_realm = ${SASL_REALM} +sasl_authz_id = ${SASL_AUTHZ_ID} +sasl_minssf = ${SASL_MINSSF} +start_tls = ${START_TLS} +tls_ca_cert_dir = ${TLS_CA_CERT_DIR} +tls_ca_cert_file = ${TLS_CA_CERT_FILE} +tls_cert = ${TLS_CERT} +tls_key = ${TLS_KEY} +tls_require_cert = ${TLS_REQUIRE_CERT} +tls_random_file = ${TLS_RANDOM_FILE} +tls_cipher_suite = ${TLS_CIPHER_SUITE} diff --git a/target/features/ldap/saslauthd.base b/target/features/ldap/saslauthd.base index 508c6e24..f93cf07a 100644 --- a/target/features/ldap/saslauthd.base +++ b/target/features/ldap/saslauthd.base @@ -1,6 +1,6 @@ -ldap_bind_dn: ${BIND_DN} -ldap_bind_pw: ${BIND_PW} -ldap_servers: ${SERVER_HOST} -ldap_search_base: ${SEARCH_BASE} -ldap_filter: (&(uniqueIdentifier=%u)(mailEnabled=TRUE)) -ldap_referrals: yes +ldap_bind_dn: ${BIND_DN} +ldap_bind_pw: ${BIND_PW} +ldap_servers: ${SERVER_HOST} +ldap_search_base: ${SEARCH_BASE} +ldap_filter: (&(uniqueIdentifier=%u)(mailEnabled=TRUE)) +ldap_referrals: yes diff --git a/target/features/ldap/saslauthd.tmpl b/target/features/ldap/saslauthd.tmpl index f07c985d..47957501 100644 --- a/target/features/ldap/saslauthd.tmpl +++ b/target/features/ldap/saslauthd.tmpl @@ -1,36 +1,36 @@ -# Parameter docs: https://github.com/cyrusimap/cyrus-sasl/blob/3959d45aa187d906d5fb3e8edf7e3661780967a5/saslauthd/LDAP_SASLAUTHD#L85-L242 -ldap_auth_method: ${LDAP_AUTH_METHOD} -ldap_bind_dn: ${LDAP_BIND_DN} -ldap_bind_pw: ${LDAP_BIND_PW} -ldap_default_domain: ${LDAP_DEFAULT_DOMAIN} -ldap_default_realm: ${LDAP_DEFAULT_REALM} -ldap_deref: ${LDAP_DEREF} -ldap_filter: ${LDAP_FILTER} -ldap_group_attr: ${LDAP_GROUP_ATTR} -ldap_group_dn: ${LDAP_GROUP_DN} -ldap_group_filter: ${LDAP_GROUP_FILTER} -ldap_group_match_method: ${LDAP_GROUP_MATCH_METHOD} -ldap_group_search_base: ${LDAP_GROUP_SEARCH_BASE} -ldap_group_scope: ${LDAP_GROUP_SCOPE} -ldap_password: ${LDAP_PASSWORD} -ldap_password_attr: ${LDAP_PASSWORD_ATTR} -ldap_referrals: ${LDAP_REFERRALS} -ldap_restart: ${LDAP_RESTART} -ldap_id: ${LDAP_ID} -ldap_authz_id: ${LDAP_AUTHZ_ID} -ldap_mech: ${LDAP_MECH} -ldap_realm: ${LDAP_REALM} -ldap_scope: ${LDAP_SCOPE} -ldap_search_base: ${LDAP_SEARCH_BASE} -ldap_servers: ${LDAP_SERVERS} -ldap_start_tls: ${LDAP_START_TLS} -ldap_time_limit: ${LDAP_TIME_LIMIT} -ldap_timeout: ${LDAP_TIMEOUT} -ldap_tls_check_peer: ${LDAP_TLS_CHECK_PEER} -ldap_tls_cacert_file: ${LDAP_TLS_CACERT_FILE} -ldap_tls_cacert_dir: ${LDAP_TLS_CACERT_DIR} -ldap_tls_ciphers: ${LDAP_TLS_CIPHERS} -ldap_tls_cert: ${LDAP_TLS_CERT} -ldap_tls_key: ${LDAP_TLS_KEY} -ldap_use_sasl: ${LDAP_USE_SASL} -ldap_version: ${LDAP_VERSION} +# Parameter docs: https://github.com/cyrusimap/cyrus-sasl/blob/3959d45aa187d906d5fb3e8edf7e3661780967a5/saslauthd/LDAP_SASLAUTHD#L85-L242 +ldap_auth_method: ${LDAP_AUTH_METHOD} +ldap_bind_dn: ${LDAP_BIND_DN} +ldap_bind_pw: ${LDAP_BIND_PW} +ldap_default_domain: ${LDAP_DEFAULT_DOMAIN} +ldap_default_realm: ${LDAP_DEFAULT_REALM} +ldap_deref: ${LDAP_DEREF} +ldap_filter: ${LDAP_FILTER} +ldap_group_attr: ${LDAP_GROUP_ATTR} +ldap_group_dn: ${LDAP_GROUP_DN} +ldap_group_filter: ${LDAP_GROUP_FILTER} +ldap_group_match_method: ${LDAP_GROUP_MATCH_METHOD} +ldap_group_search_base: ${LDAP_GROUP_SEARCH_BASE} +ldap_group_scope: ${LDAP_GROUP_SCOPE} +ldap_password: ${LDAP_PASSWORD} +ldap_password_attr: ${LDAP_PASSWORD_ATTR} +ldap_referrals: ${LDAP_REFERRALS} +ldap_restart: ${LDAP_RESTART} +ldap_id: ${LDAP_ID} +ldap_authz_id: ${LDAP_AUTHZ_ID} +ldap_mech: ${LDAP_MECH} +ldap_realm: ${LDAP_REALM} +ldap_scope: ${LDAP_SCOPE} +ldap_search_base: ${LDAP_SEARCH_BASE} +ldap_servers: ${LDAP_SERVERS} +ldap_start_tls: ${LDAP_START_TLS} +ldap_time_limit: ${LDAP_TIME_LIMIT} +ldap_timeout: ${LDAP_TIMEOUT} +ldap_tls_check_peer: ${LDAP_TLS_CHECK_PEER} +ldap_tls_cacert_file: ${LDAP_TLS_CACERT_FILE} +ldap_tls_cacert_dir: ${LDAP_TLS_CACERT_DIR} +ldap_tls_ciphers: ${LDAP_TLS_CIPHERS} +ldap_tls_cert: ${LDAP_TLS_CERT} +ldap_tls_key: ${LDAP_TLS_KEY} +ldap_use_sasl: ${LDAP_USE_SASL} +ldap_version: ${LDAP_VERSION}