diff options
| author | Tomas Krizek <tkrizek@redhat.com> | 2016-12-19 13:12:19 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2017-02-09 16:34:53 +0100 |
| commit | e8a2abd548b594e6f22f38445ee32bcaa7f27303 (patch) | |
| tree | 73f532a8985e6db8859fcb3c4f48a1b2569ff89a | |
| parent | c26dd805bdb020b12346d8cb66638883c1f46b9e (diff) | |
| download | freeipa-e8a2abd548b594e6f22f38445ee32bcaa7f27303.tar.gz freeipa-e8a2abd548b594e6f22f38445ee32bcaa7f27303.tar.xz freeipa-e8a2abd548b594e6f22f38445ee32bcaa7f27303.zip | |
named.conf template: update API for bind 9.11
Use the new API for bind 9.11. Removed deprecated "serial_autoincrement"
and updated the rest of configuration to conform to the new format.
This only fixes new IPA installations. For existing installations,
named.conf will be transformed when the new version of bind-dyndb-ldap
is installed.
https://fedorahosted.org/freeipa/ticket/6565
Reviewed-By: Martin Basti <mbasti@redhat.com>
| -rw-r--r-- | install/share/bind.named.conf.template | 16 | ||||
| -rw-r--r-- | ipaplatform/redhat/paths.py | 1 | ||||
| -rw-r--r-- | ipaserver/install/bindinstance.py | 1 |
3 files changed, 9 insertions, 9 deletions
diff --git a/install/share/bind.named.conf.template b/install/share/bind.named.conf.template index e8ea8fba0..b7c3a0b78 100644 --- a/install/share/bind.named.conf.template +++ b/install/share/bind.named.conf.template @@ -43,13 +43,11 @@ zone "." IN { include "$RFC1912_ZONES"; include "$ROOT_KEY"; -dynamic-db "ipa" { - library "ldap.so"; - arg "uri ldapi://%2fvar%2frun%2fslapd-$SERVER_ID.socket"; - arg "base cn=dns, $SUFFIX"; - arg "server_id $FQDN"; - arg "auth_method sasl"; - arg "sasl_mech GSSAPI"; - arg "sasl_user DNS/$FQDN"; - arg "serial_autoincrement yes"; +dyndb "ipa" "$BIND_LDAP_SO" { + uri "ldapi://%2fvar%2frun%2fslapd-$SERVER_ID.socket"; + base "cn=dns, $SUFFIX"; + server_id "$FQDN"; + auth_method "sasl"; + sasl_mech "GSSAPI"; + sasl_user "DNS/$FQDN"; }; diff --git a/ipaplatform/redhat/paths.py b/ipaplatform/redhat/paths.py index aaf71e2d3..91ba9d05e 100644 --- a/ipaplatform/redhat/paths.py +++ b/ipaplatform/redhat/paths.py @@ -33,6 +33,7 @@ class RedHatPathNamespace(BasePathNamespace): if sys.maxsize > 2**32: LIBSOFTHSM2_SO = BasePathNamespace.LIBSOFTHSM2_SO_64 PAM_KRB5_SO = BasePathNamespace.PAM_KRB5_SO_64 + BIND_LDAP_SO = BasePathNamespace.BIND_LDAP_SO_64 AUTHCONFIG = '/usr/sbin/authconfig' diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index e24249aca..c9097c2f9 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -769,6 +769,7 @@ class BindInstance(service.Service): RFC1912_ZONES=paths.NAMED_RFC1912_ZONES, NAMED_PID=paths.NAMED_PID, NAMED_VAR_DIR=paths.NAMED_VAR_DIR, + BIND_LDAP_SO=paths.BIND_LDAP_SO, ) def __setup_dns_container(self): |