Merge pull request #46 from jkellerer/enh-deterministic-rpcports

Deterministic RPC port range

README.md

@@ -133,8 +133,8 @@ docker run -t -i \
     -p 192.168.3.222:464:464 \
     -p 192.168.3.222:464:464/udp \
     -p 192.168.3.222:636:636 \
-    -p 192.168.3.222:1024-1044:1024-1044 \
     -p 192.168.3.222:3268-3269:3268-3269 \
+    -p 192.168.3.222:49152-49172:49152-49172 \
     -v /etc/localtime:/etc/localtime:ro \
     -v /data/docker/containers/samba/data/:/var/lib/samba \
     -v /data/docker/containers/samba/config/samba:/etc/samba/external \
@@ -178,8 +178,8 @@ docker run -t -i \
     -p 192.168.3.222:464:464 \
     -p 192.168.3.222:464:464/udp \
     -p 192.168.3.222:636:636 \
-    -p 192.168.3.222:1024-1044:1024-1044 \
     -p 192.168.3.222:3268-3269:3268-3269 \
+    -p 192.168.3.222:49152-49172:49152-49172 \
     -v /etc/localtime:/etc/localtime:ro \
     -v /data/docker/containers/samba/data/:/var/lib/samba \
     -v /data/docker/containers/samba/config/samba:/etc/samba/external \
@@ -229,8 +229,8 @@ docker run -t -i \
     -p 192.168.3.222:464:464 \
     -p 192.168.3.222:464:464/udp \
     -p 192.168.3.222:636:636 \
-    -p 192.168.3.222:1024-1044:1024-1044 \
     -p 192.168.3.222:3268-3269:3268-3269 \
+    -p 192.168.3.222:49152-49172:49152-49172 \
     -v /etc/localtime:/etc/localtime:ro \
     -v /data/docker/containers/samba/data/:/var/lib/samba \
     -v /data/docker/containers/samba/config/samba:/etc/samba/external \
@@ -301,8 +301,8 @@ services:
       - 192.168.3.222:464:464
       - 192.168.3.222:464:464/udp
       - 192.168.3.222:636:636
-      - 192.168.3.222:1024-1044:1024-1044
       - 192.168.3.222:3268-3269:3268-3269
+      - 192.168.3.222:49152-49172:49152-49172
     dns_search:
       - corp.example.com
     dns:
@@ -367,8 +367,8 @@ services:
       - 192.168.3.222:464:464
       - 192.168.3.222:464:464/udp
       - 192.168.3.222:636:636
-      - 192.168.3.222:1024-1044:1024-1044
       - 192.168.3.222:3268-3269:3268-3269
+      - 192.168.3.222:49152-49172:49152-49172
     dns_search:
       - corp.example.com
     dns:
@@ -441,8 +441,8 @@ services:
       - 192.168.3.222:464:464
       - 192.168.3.222:464:464/udp
       - 192.168.3.222:636:636
-      - 192.168.3.222:1024-1044:1024-1044
       - 192.168.3.222:3268-3269:3268-3269
+      - 192.168.3.222:49152-49172:49152-49172
     dns_search:
       - corp.example.com
     dns:

init.sh

@@ -14,6 +14,7 @@ appSetup () {
 	INSECURELDAP=${INSECURELDAP:-false}
 	DNSFORWARDER=${DNSFORWARDER:-NONE}
 	HOSTIP=${HOSTIP:-NONE}
+	RPCPORTS=${RPCPORTS:-"49152-49172"}
 	DOMAIN_DC=${DOMAIN_DC:-${DOMAIN_DC}}
 	
 	LDOMAIN=${DOMAIN,,}
@@ -68,7 +69,8 @@ appSetup () {
 			template homedir = /home/%U\\n\
 			idmap config ${URDOMAIN} : schema_mode = rfc2307\\n\
 			idmap config ${URDOMAIN} : unix_nss_info = yes\\n\
-			idmap config ${URDOMAIN} : backend = ad\
+			idmap config ${URDOMAIN} : backend = ad\\n\
+			rpc server dynamic port range = ${RPCPORTS}\
 			" /etc/samba/smb.conf
 		sed -i "s/LOCALDC/${URDOMAIN}DC/g" /etc/samba/smb.conf
 		if [[ $DNSFORWARDER != "NONE" ]]; then