ZOOKEEPER-2122: update readme + use FQDN in SSL certs during testing

symat · Mate Szalay-Beko · commit 08294ce91a9d · 2019-11-19T15:07:37.000+01:00
diff --git a/README_packaging.md b/README_packaging.md
@@ -8,21 +8,23 @@ http://bigtop.apache.org/
 
 ## Requirements
 
-- ant (recommended version 1.9.4 or later for concurrent JUnit test execution) or maven to build the java code
-- gcc, cppunit and python-setuptools are required to build C and python bindings.
+- you need maven to build the java code
+- gcc, cppunit, openssl and python-setuptools are required to build C and python bindings. (only needed when using `-Pfull-build`)
 
 On RHEL machine:
 
 ```
 yum install cppunit
 yum install python-setuptools
+yum install openssl openssl-devel
 ```
 
 On Ubuntu:
 
 ```
 apt-get install cppunit
 apt-get install python-setuptools
+apt-get install openssl libssl-dev
 ```
 
 
diff --git a/zookeeper-client/zookeeper-client-c/ssl/gencerts.sh b/zookeeper-client/zookeeper-client-c/ssl/gencerts.sh
@@ -25,6 +25,11 @@
 # relative to the canonical path of this script.
 #
 
+# use local fully qualified domain name in the certificates, or fall back
+# to zookeeper.apache.org if no domain name is set or the `hostname` command fails
+FQDN=`hostname -f`
+FQDN=${FQDN:-"zookeeper.apache.org"}
+
 # Generate the root key
 openssl genrsa -out rootkey.pem 2048
 
@@ -42,8 +47,8 @@ C = US
 ST = California
 L = San Francisco
 O = ZooKeeper
-emailAddress = dev@zookeeper.apache.org
-CN = zookeeper.apache.org
+emailAddress = dev@$FQDN
+CN = $FQDN
 EOF
 )
 
@@ -64,8 +69,8 @@ C = US
 ST = California
 L = San Francisco
 O = ZooKeeper
-emailAddress = dev@zookeeper.apache.org
-CN = zookeeper.apache.org
+emailAddress = dev@$FQDN
+CN = $FQDN
 EOF
 )
 openssl x509 -req -in client.csr -CA root.crt -CAkey rootkey.pem -CAcreateserial -days 3650 -out client.crt
@@ -95,8 +100,8 @@ C = US
 ST = California
 L = San Francisco
 O = ZooKeeper
-emailAddress = dev@zookeeper.apache.org
-CN = zookeeper.apache.org
+emailAddress = dev@$FQDN
+CN = $FQDN
 EOF
 )
 openssl x509 -req -in server.csr -CA root.crt -CAkey rootkey.pem -CAcreateserial -days 3650 -out server.crt
