CentOS7 fixes.

doc/build.sh

@@ -8,10 +8,10 @@ fi
 
 rm -f *.1 *.2 *.8
 
-if [ -e /usr/bin/ronn ]; then
-	/usr/bin/ronn -r zerotier-cli.1.md
-	/usr/bin/ronn -r zerotier-idtool.1.md
-	/usr/bin/ronn -r zerotier-one.8.md
+if [ -e /usr/bin/ronn -o -e /usr/local/bin/ronn ]; then
+	ronn -r zerotier-cli.1.md
+	ronn -r zerotier-idtool.1.md
+	ronn -r zerotier-one.8.md
 else
 	if [ ! -f /usr/bin/node -a ! -f /usr/bin/nodejs ]; then
 		echo 'Unable to build man pages: no /usr/bin/ronn or /usr/bin/node / nodejs!'

linux-build-farm/build.sh

@@ -31,7 +31,7 @@ for distro in $*; do
 	mv zt1-src.tar.gz ../..
 	cd ..
 
-#	docker run --rm -v `pwd`:/artifacts --privileged -it zt1-build-${distro}-x64 /bin/bash -c 'cd /ZeroTierOne ; make `[ -f /etc/debian_version ] && echo debian || echo redhat` ; cd .. ; cp *.deb /artifacts ; ls -l /artifacts'
+#	docker run --rm -v `pwd`:/artifacts --privileged -it zt1-build-${distro}-x64 /bin/bash -c 'cd /ZeroTierOne ; make debian ; cd .. ; cp *.deb /artifacts ; ls -l /artifacts'
 
 	cd x86
 	mv ../../zt1-src.tar.gz .
@@ -39,7 +39,7 @@ for distro in $*; do
 	mv zt1-src.tar.gz ../..
 	cd ..
 
-#	docker run --rm -v `pwd`:/artifacts --privileged -it zt1-build-${distro}-x86 /bin/bash -c 'cd /ZeroTierOne ; make `[ -f /etc/debian_version ] && echo debian || echo redhat` ; cd .. ; cp *.deb /artifacts ; ls -l /artifacts'
+#	docker run --rm -v `pwd`:/artifacts --privileged -it zt1-build-${distro}-x86 /bin/bash -c 'cd /ZeroTierOne ; make debian ; cd .. ; cp *.deb /artifacts ; ls -l /artifacts'
 
 	cd ..
 done

linux-build-farm/centos-7/x64/Dockerfile

@@ -7,4 +7,7 @@ RUN yum install -y make development-tools rpmdevtools http-parser-devel lz4-deve
 
 RUN yum install -y clang gcc-c++
 
+RUN yum install -y ruby ruby-devel
+RUN gem install ronn
+
 ADD zt1-src.tar.gz /

linux-build-farm/centos-7/x86/Dockerfile

@@ -14,4 +14,7 @@
 FROM zerotier/zt1-build-centos-7-x86-base
 MAINTAINER Adam Ierymenko <[email protected]>
 
+RUN yum install -y ruby ruby-devel
+RUN gem install ronn
+
 ADD zt1-src.tar.gz /