--- univention-samba4/scripts/setup-dns-in-ucsldap.sh (Revision 31173) +++ univention-samba4/scripts/setup-dns-in-ucsldap.sh (Arbeitskopie) @@ -32,6 +32,8 @@ . /usr/share/univention-lib/all.sh +sitename='Default-First-Site-Name' + optspec="h-:" while getopts "$optspec" option; do case "${option}" in @@ -59,11 +61,24 @@ fi OPTIND=$((OPTIND+1)) ;; + site) + ## allow "--site=foo" and "--site foo" + val=${OPTARG#*=} + if [ "$val" != "$OPTARG" ]; then + opt=${OPTARG%=$val} + else + val="${!OPTIND}" + opt="${OPTARG}" + fi + ## store the sitename + sitename="$val" + OPTIND=$((OPTIND+1)) + ;; *) echo "Unknown option --${OPTARG}" >&2 ;; esac;; - h|*) echo "usage: $0 [--dc|--rodc] [--gc|--rogc] [--pdc]"; exit 1;; + h|*) echo "usage: $0 [--dc|--rodc] [--gc|--rogc] [--pdc] [--site=SITENAME]"; echo 'default site is "Default-First-Site-Name"'; exit 1;; esac done set -- "${UDM_ARGV[@]}" @@ -139,16 +154,16 @@ ### ## _ldap._tcp.Default-First-Site-Name._sites IN SRV 0 100 389 qamaster - /usr/share/univention-admin-tools/univention-dnsedit $@ --ignore-exists $domainname add srv ldap._tcp.Default-First-Site-Name sites 0 100 389 $hostname.$domainname. + /usr/share/univention-admin-tools/univention-dnsedit $@ --ignore-exists $domainname add srv "ldap._tcp.$sitename" sites 0 100 389 $hostname.$domainname. ## _ldap._tcp.Default-First-Site-Name._sites.dc._msdcs IN SRV 0 100 389 qamaster - /usr/share/univention-admin-tools/univention-dnsedit $@ --ignore-exists $domainname add srv ldap._tcp.Default-First-Site-Name._sites.dc msdcs 0 100 389 $hostname.$domainname. + /usr/share/univention-admin-tools/univention-dnsedit $@ --ignore-exists $domainname add srv "ldap._tcp.$sitename._sites.dc" msdcs 0 100 389 $hostname.$domainname. ### ### krb5 servers ## _kerberos._tcp.Default-First-Site-Name._sites IN SRV 0 100 88 qamaster - /usr/share/univention-admin-tools/univention-dnsedit $@ --ignore-exists $domainname add srv kerberos._tcp.Default-First-Site-Name sites 0 100 88 $hostname.$domainname. + /usr/share/univention-admin-tools/univention-dnsedit $@ --ignore-exists $domainname add srv "kerberos._tcp.$sitename" sites 0 100 88 $hostname.$domainname. ## _kerberos._tcp.Default-First-Site-Name._sites.dc._msdcs IN SRV 0 100 88 qamaster - /usr/share/univention-admin-tools/univention-dnsedit $@ --ignore-exists $domainname add srv kerberos._tcp.Default-First-Site-Name._sites.dc msdcs 0 100 88 $hostname.$domainname. + /usr/share/univention-admin-tools/univention-dnsedit $@ --ignore-exists $domainname add srv "kerberos._tcp.$sitename._sites.dc" msdcs 0 100 88 $hostname.$domainname. ####### ####### ### heimdal 'find realm for host' hack @@ -165,16 +180,16 @@ ### ### ldap servers ## _ldap._tcp.Default-First-Site-Name._sites IN SRV 0 100 389 qamaster - /usr/share/univention-admin-tools/univention-dnsedit $@ --ignore-exists $domainname add srv ldap._tcp.Default-First-Site-Name sites 0 100 389 $hostname.$domainname. + /usr/share/univention-admin-tools/univention-dnsedit $@ --ignore-exists $domainname add srv "ldap._tcp.$sitename" sites 0 100 389 $hostname.$domainname. ## _ldap._tcp.Default-First-Site-Name._sites.dc._msdcs IN SRV 0 100 389 qamaster - /usr/share/univention-admin-tools/univention-dnsedit $@ --ignore-exists $domainname add srv ldap._tcp.Default-First-Site-Name._sites.dc msdcs 0 100 389 $hostname.$domainname. + /usr/share/univention-admin-tools/univention-dnsedit $@ --ignore-exists $domainname add srv "ldap._tcp.$sitename._sites.dc" msdcs 0 100 389 $hostname.$domainname. ### ### krb5 servers ## _kerberos._tcp.Default-First-Site-Name._sites IN SRV 0 100 88 qamaster - /usr/share/univention-admin-tools/univention-dnsedit $@ --ignore-exists $domainname add srv kerberos._tcp.Default-First-Site-Name sites 0 100 88 $hostname.$domainname. + /usr/share/univention-admin-tools/univention-dnsedit $@ --ignore-exists $domainname add srv "kerberos._tcp.$sitename" sites 0 100 88 $hostname.$domainname. ## _kerberos._tcp.Default-First-Site-Name._sites.dc._msdcs IN SRV 0 100 88 qamaster - /usr/share/univention-admin-tools/univention-dnsedit $@ --ignore-exists $domainname add srv kerberos._tcp.Default-First-Site-Name._sites.dc msdcs 0 100 88 $hostname.$domainname. + /usr/share/univention-admin-tools/univention-dnsedit $@ --ignore-exists $domainname add srv "kerberos._tcp.$sitename._sites.dc" msdcs 0 100 88 $hostname.$domainname. fi @@ -191,9 +206,9 @@ /usr/share/univention-admin-tools/univention-dnsedit $@ --ignore-exists $domainname add srv ldap._tcp.gc msdcs 0 100 3268 $hostname.$domainname. ## _gc._tcp.Default-First-Site-Name._sites IN SRV 0 100 3268 qamaster - /usr/share/univention-admin-tools/univention-dnsedit $@ --ignore-exists $domainname add srv gc._tcp.Default-First-Site-Name sites 0 100 3268 $hostname.$domainname. + /usr/share/univention-admin-tools/univention-dnsedit $@ --ignore-exists $domainname add srv "gc._tcp.$sitename" sites 0 100 3268 $hostname.$domainname. ## _ldap._tcp.Default-First-Site-Name._sites.gc._msdcs IN SRV 0 100 3268 qamaster - /usr/share/univention-admin-tools/univention-dnsedit $@ --ignore-exists $domainname add srv ldap._tcp.Default-First-Site-Name._sites.gc msdcs 0 100 3268 $hostname.$domainname. + /usr/share/univention-admin-tools/univention-dnsedit $@ --ignore-exists $domainname add srv "ldap._tcp.$sitename._sites.gc" msdcs 0 100 3268 $hostname.$domainname. ####### ####### fi @@ -205,9 +220,9 @@ fi ## _gc._tcp.Default-First-Site-Name._sites IN SRV 0 100 3268 qamaster - /usr/share/univention-admin-tools/univention-dnsedit $@ --ignore-exists $domainname add srv gc._tcp.Default-First-Site-Name sites 0 100 3268 $hostname.$domainname. + /usr/share/univention-admin-tools/univention-dnsedit $@ --ignore-exists $domainname add srv "gc._tcp.$sitename" sites 0 100 3268 $hostname.$domainname. ## _ldap._tcp.Default-First-Site-Name._sites.gc._msdcs IN SRV 0 100 3268 qamaster - /usr/share/univention-admin-tools/univention-dnsedit $@ --ignore-exists $domainname add srv ldap._tcp.Default-First-Site-Name._sites.gc msdcs 0 100 3268 $hostname.$domainname. + /usr/share/univention-admin-tools/univention-dnsedit $@ --ignore-exists $domainname add srv "ldap._tcp.$sitename._sites.gc" msdcs 0 100 3268 $hostname.$domainname. ####### ####### fi