Remove netcon from dev branch. This is moving to its own new ZeroTierSDK repo for future release under the SDK name.

15 files changed, 0 insertions, 750 deletions

diff --git a/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/monitor_dockerfile b/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/monitor_dockerfile
deleted file mode 100644
index d2d2a0cb..00000000
--- a/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/monitor_dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# ZT Network Containers Test Monitor
-FROM fedora:23
-MAINTAINER https://www.zerotier.com/
-
-EXPOSE 9993/udp
-
-# Add ZT files
-RUN mkdir -p /var/lib/zerotier-one/networks.d
-ADD monitor_identity.public /var/lib/zerotier-one/identity.public
-ADD monitor_identity.secret /var/lib/zerotier-one/identity.secret
-ADD *.conf /var/lib/zerotier-one/networks.d/
-ADD *.conf /
-ADD *.name /
-
-# Install LWIP library used by service
-ADD liblwip.so /var/lib/zerotier-one/liblwip.so
-
-ADD zerotier-one /
-ADD zerotier-cli /
-
-# Start ZeroTier-One
-ADD monitor_entrypoint.sh /monitor_entrypoint.sh
-RUN chmod -v +x /monitor_entrypoint.sh
-CMD ["./monitor_entrypoint.sh"]
diff --git a/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/monitor_entrypoint.sh b/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/monitor_entrypoint.sh
deleted file mode 100644
index c8fca5a3..00000000
--- a/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/monitor_entrypoint.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-
-export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
-
-
-# --- Test Parameters ---
-test_namefile=$(ls *.name)
-test_name="${test_namefile%.*}" # test network id
-nwconf=$(ls *.conf) # blank test network config file
-nwid="${nwconf%.*}" # test network id
-netcon_wait_time=35 # wait for test container to come online
-app_timeout_time=25 # app-specific timeout
-file_path=/opt/results/ # test result output file path (fs shared between host and containers)
-file_base="$test_name".txt # test result output file
-fail=FAIL. # appended to result file in event of failure
-ok=OK. # appended to result file in event of success
-tmp_ext=.tmp # temporary filetype used for sharing test data between containers
-address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
-bigfile_name=bigfile # large, random test transfer file
-rx_md5sumfile="$file_path"rx_"$bigfile_name"_md5sum"$tmp_ext"
-tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
-
-
-# --- Network Config ---
-echo '*** ZeroTier Network Containers Test Monitor'
-chown -R daemon /var/lib/zerotier-one
-chgrp -R daemon /var/lib/zerotier-one
-su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
-virtip4=""
-while [ -z "$virtip4" ]; do
-	sleep 0.2
-	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
-done
-echo '*** Starting Test...'
-echo '*** Up and running at' $virtip4 ' on network: ' $nwid
-echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
-sleep "$netcon_wait_time"s
-ncvirtip=$(<$address_file)
-
-
-# --- Test section ---
-echo '*** Curling from intercepted server at' $ncvirtip
-rm -rf "$file_path"*."$file_base"
-touch "$bigfile_name"
-
-# Perform test
-# curl --connect-timeout "$app_timeout_time" -v -o "$file_path$file_base" http://"$ncvirtip"/index.html
-# Large transfer test
-curl --connect-timeout "$app_timeout_time" -v -o "$bigfile_name" http://"$ncvirtip"/"$bigfile_name"
-
-# Check md5
-md5sum < "$bigfile_name" > "$rx_md5sumfile"
-rx_md5sum=$(<$rx_md5sumfile)
-tx_md5sum=$(<$tx_md5sumfile)
-
-echo '*** Comparing md5: ' "$rx_md5sum" ' and ' "$tx_md5sum"
-
-if [ "$rx_md5sum" != "$tx_md5sum" ]; 
-then
-	echo 'MD5 FAIL'
-	touch "$file_path$fail$test_name.txt"
-	printf 'Test: md5 sum did not match!\n' >> "$file_path$fail$test_name.txt"
-else
-	echo 'MD5 OK'
-	touch "$file_path$ok$test_name.txt"
-	printf 'Test: md5 sum ok!\n' >> "$file_path$ok$test_name.txt"
-	cat "$rx_md5sumfile" >> "$file_path$ok$test_name.txt"
-	cat "$tx_md5sumfile" >> "$file_path$ok$test_name.txt"
-fi
-
-
-
-
-
-
-
-
-
-
-
diff --git a/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_dockerfile b/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_dockerfile
deleted file mode 100644
index cb9c1cc0..00000000
--- a/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_dockerfile
+++ /dev/null
@@ -1,43 +0,0 @@
-# ZT Network Containers Test
-FROM ubuntu:14.04
-MAINTAINER https://www.zerotier.com/
-
-
-# Install
-RUN \
-  sed -i 's/# \(.*multiverse$\)/\1/g' /etc/apt/sources.list && \
-  apt-get update && \
-  apt-get -y upgrade && \
-  apt-get -y install nginx
-
-EXPOSE 9993/udp 80/udp
-
-# Add ZT files
-RUN mkdir -p /var/lib/zerotier-one/networks.d
-ADD netcon_identity.public /var/lib/zerotier-one/identity.public
-ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
-ADD *.conf /var/lib/zerotier-one/networks.d/
-ADD *.conf /
-ADD *.name /
-
-# Install LWIP library used by service
-ADD liblwip.so /var/lib/zerotier-one/liblwip.so
-
-# Install syscall intercept library
-ADD zerotier-intercept /
-ADD libzerotierintercept.so /
-RUN cp libzerotierintercept.so lib/libzerotierintercept.so
-RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
-RUN /usr/bin/install -c zerotier-intercept /usr/bin
-
-ADD zerotier-cli /
-ADD zerotier-netcon-service /
-
-# Install test scripts
-ADD netcon_entrypoint.sh /netcon_entrypoint.sh
-RUN chmod -v +x /netcon_entrypoint.sh
-
-ADD nginx.conf_ /
-
-# Start ZeroTier-One
-CMD ["./netcon_entrypoint.sh"]
diff --git a/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_entrypoint.sh b/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_entrypoint.sh
deleted file mode 100644
index b9b8ef71..00000000
--- a/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_entrypoint.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
-
-
-# --- Test Parameters ---
-test_namefile=$(ls *.name)
-test_name="${test_namefile%.*}" # test network id
-nwconf=$(ls {*.conf,}) # blank test network config file
-nwid="${nwconf%.*}" # test network id
-file_path=/opt/results/ # test result output file path (fs shared between host and containers)
-file_base="$test_name".txt # test result output file
-tmp_ext=.tmp # temporary filetype used for sharing test data between containers
-address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
-bigfile_name=bigfile
-bigfile_size=10M # size of file we want to use for the test
-tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
-
-
-# --- Network Config ---
-echo '*** ZeroTier Network Containers Test: ' "$test_name"
-chown -R daemon /var/lib/zerotier-one
-chgrp -R daemon /var/lib/zerotier-one
-su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
-virtip4=""
-while [ -z "$virtip4" ]; do
-	sleep 0.2
-	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
-	dev=`/zerotier-cli listnetworks | grep -F "" | cut -d ' ' -f 8 | cut -d "_" -f 2 | sed "s/^<dev>//" | tr '\n' '\0'`
-done
-echo '*** Up and running at' $virtip4 ' on network: ' $nwid
-echo '*** Writing address to ' "$address_file"
-echo $virtip4 > "$address_file"
-
-# --- Test section ---
-cp -f nginx.conf_ /etc/nginx/nginx.conf
-nginx_html_path=/usr/share/nginx/html/
-# Generate large random file for transfer test, share md5sum for monitor container to check
-echo '*** Generating ' "$bigfile_size" ' file'
-dd if=/dev/urandom of="$nginx_html_path$bigfile_name"  bs="$bigfile_size"  count=1
-#md5sum /var/www/html/"$bigfile_name" >> "$tx_md5sumfile"
-md5sum < "$nginx_html_path$bigfile_name" > "$tx_md5sumfile"
-echo '*** Wrote MD5 sum to ' "$tx_md5sumfile"
-
-echo '*** Starting application...'
-sleep 0.5
-
-export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev"
-export LD_PRELOAD=./libzerotierintercept.so
-nginx
diff --git a/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/nginx.conf_ b/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/nginx.conf_
deleted file mode 100644
index 7069ef03..00000000
--- a/netcon/docker-test/nginx/nginx-1.4.6-1.ub14.x86_64/nginx.conf_
+++ /dev/null
@@ -1,55 +0,0 @@
-# For more information on configuration, see:
-#   * Official English Documentation: http://nginx.org/en/docs/
-#   * Official Russian Documentation: http://nginx.org/ru/docs/
-
-user nginx;
-worker_processes auto;
-error_log /var/log/nginx/error.log;
-pid /run/nginx.pid;
-
-events {
-    worker_connections 1024;
-}
-
-http {
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
-
-    access_log  /var/log/nginx/access.log  main;
-
-    sendfile            on;
-    tcp_nopush          on;
-    tcp_nodelay         on;
-    keepalive_timeout   65;
-    types_hash_max_size 2048;
-
-    include             /etc/nginx/mime.types;
-    default_type        application/octet-stream;
-
-    # Load modular configuration files from the /etc/nginx/conf.d directory.
-    # See http://nginx.org/en/docs/ngx_core_module.html#include
-    # for more information.
-    include /etc/nginx/conf.d/*.conf;
-
-    server {
-        listen       80 default_server;
-        #listen       [::]:80 default_server;
-        server_name  _;
-        root         /usr/share/nginx/html;
-
-        # Load configuration files for the default server block.
-        include /etc/nginx/default.d/*.conf;
-
-        location / {
-        }
-
-        error_page 404 /404.html;
-            location = /40x.html {
-        }
-
-        error_page 500 502 503 504 /50x.html;
-            location = /50x.html {
-        }
-    }
-}
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_dockerfile b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_dockerfile
deleted file mode 100644
index d2d2a0cb..00000000
--- a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# ZT Network Containers Test Monitor
-FROM fedora:23
-MAINTAINER https://www.zerotier.com/
-
-EXPOSE 9993/udp
-
-# Add ZT files
-RUN mkdir -p /var/lib/zerotier-one/networks.d
-ADD monitor_identity.public /var/lib/zerotier-one/identity.public
-ADD monitor_identity.secret /var/lib/zerotier-one/identity.secret
-ADD *.conf /var/lib/zerotier-one/networks.d/
-ADD *.conf /
-ADD *.name /
-
-# Install LWIP library used by service
-ADD liblwip.so /var/lib/zerotier-one/liblwip.so
-
-ADD zerotier-one /
-ADD zerotier-cli /
-
-# Start ZeroTier-One
-ADD monitor_entrypoint.sh /monitor_entrypoint.sh
-RUN chmod -v +x /monitor_entrypoint.sh
-CMD ["./monitor_entrypoint.sh"]
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_entrypoint.sh b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_entrypoint.sh
deleted file mode 100644
index c8fca5a3..00000000
--- a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_entrypoint.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-
-export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
-
-
-# --- Test Parameters ---
-test_namefile=$(ls *.name)
-test_name="${test_namefile%.*}" # test network id
-nwconf=$(ls *.conf) # blank test network config file
-nwid="${nwconf%.*}" # test network id
-netcon_wait_time=35 # wait for test container to come online
-app_timeout_time=25 # app-specific timeout
-file_path=/opt/results/ # test result output file path (fs shared between host and containers)
-file_base="$test_name".txt # test result output file
-fail=FAIL. # appended to result file in event of failure
-ok=OK. # appended to result file in event of success
-tmp_ext=.tmp # temporary filetype used for sharing test data between containers
-address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
-bigfile_name=bigfile # large, random test transfer file
-rx_md5sumfile="$file_path"rx_"$bigfile_name"_md5sum"$tmp_ext"
-tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
-
-
-# --- Network Config ---
-echo '*** ZeroTier Network Containers Test Monitor'
-chown -R daemon /var/lib/zerotier-one
-chgrp -R daemon /var/lib/zerotier-one
-su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
-virtip4=""
-while [ -z "$virtip4" ]; do
-	sleep 0.2
-	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
-done
-echo '*** Starting Test...'
-echo '*** Up and running at' $virtip4 ' on network: ' $nwid
-echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
-sleep "$netcon_wait_time"s
-ncvirtip=$(<$address_file)
-
-
-# --- Test section ---
-echo '*** Curling from intercepted server at' $ncvirtip
-rm -rf "$file_path"*."$file_base"
-touch "$bigfile_name"
-
-# Perform test
-# curl --connect-timeout "$app_timeout_time" -v -o "$file_path$file_base" http://"$ncvirtip"/index.html
-# Large transfer test
-curl --connect-timeout "$app_timeout_time" -v -o "$bigfile_name" http://"$ncvirtip"/"$bigfile_name"
-
-# Check md5
-md5sum < "$bigfile_name" > "$rx_md5sumfile"
-rx_md5sum=$(<$rx_md5sumfile)
-tx_md5sum=$(<$tx_md5sumfile)
-
-echo '*** Comparing md5: ' "$rx_md5sum" ' and ' "$tx_md5sum"
-
-if [ "$rx_md5sum" != "$tx_md5sum" ]; 
-then
-	echo 'MD5 FAIL'
-	touch "$file_path$fail$test_name.txt"
-	printf 'Test: md5 sum did not match!\n' >> "$file_path$fail$test_name.txt"
-else
-	echo 'MD5 OK'
-	touch "$file_path$ok$test_name.txt"
-	printf 'Test: md5 sum ok!\n' >> "$file_path$ok$test_name.txt"
-	cat "$rx_md5sumfile" >> "$file_path$ok$test_name.txt"
-	cat "$tx_md5sumfile" >> "$file_path$ok$test_name.txt"
-fi
-
-
-
-
-
-
-
-
-
-
-
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile
deleted file mode 100644
index 8dcd5bf0..00000000
--- a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile
+++ /dev/null
@@ -1,40 +0,0 @@
-# ZT Network Containers Test
-FROM fedora:23
-MAINTAINER https://www.zerotier.com/
-
-# Install apps
-RUN yum -y update
-RUN yum -y install nginx-1:1.8.0-13.fc23.x86_64
-RUN yum clean all
-
-EXPOSE 9993/udp 80/udp
-
-# Add ZT files
-RUN mkdir -p /var/lib/zerotier-one/networks.d
-ADD netcon_identity.public /var/lib/zerotier-one/identity.public
-ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
-ADD *.conf /var/lib/zerotier-one/networks.d/
-ADD *.conf /
-ADD *.name /
-
-# Install LWIP library used by service
-ADD liblwip.so /var/lib/zerotier-one/liblwip.so
-
-# Install syscall intercept library
-ADD zerotier-intercept /
-ADD libzerotierintercept.so /
-RUN cp libzerotierintercept.so lib/libzerotierintercept.so
-RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
-RUN /usr/bin/install -c zerotier-intercept /usr/bin
-
-ADD zerotier-cli /
-ADD zerotier-netcon-service /
-
-# Install test scripts
-ADD netcon_entrypoint.sh /netcon_entrypoint.sh
-RUN chmod -v +x /netcon_entrypoint.sh
-
-ADD nginx.conf_ /
-
-# Start ZeroTier-One
-CMD ["./netcon_entrypoint.sh"]
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_entrypoint.sh
deleted file mode 100644
index b9b8ef71..00000000
--- a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_entrypoint.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
-
-
-# --- Test Parameters ---
-test_namefile=$(ls *.name)
-test_name="${test_namefile%.*}" # test network id
-nwconf=$(ls {*.conf,}) # blank test network config file
-nwid="${nwconf%.*}" # test network id
-file_path=/opt/results/ # test result output file path (fs shared between host and containers)
-file_base="$test_name".txt # test result output file
-tmp_ext=.tmp # temporary filetype used for sharing test data between containers
-address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
-bigfile_name=bigfile
-bigfile_size=10M # size of file we want to use for the test
-tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
-
-
-# --- Network Config ---
-echo '*** ZeroTier Network Containers Test: ' "$test_name"
-chown -R daemon /var/lib/zerotier-one
-chgrp -R daemon /var/lib/zerotier-one
-su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
-virtip4=""
-while [ -z "$virtip4" ]; do
-	sleep 0.2
-	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
-	dev=`/zerotier-cli listnetworks | grep -F "" | cut -d ' ' -f 8 | cut -d "_" -f 2 | sed "s/^<dev>//" | tr '\n' '\0'`
-done
-echo '*** Up and running at' $virtip4 ' on network: ' $nwid
-echo '*** Writing address to ' "$address_file"
-echo $virtip4 > "$address_file"
-
-# --- Test section ---
-cp -f nginx.conf_ /etc/nginx/nginx.conf
-nginx_html_path=/usr/share/nginx/html/
-# Generate large random file for transfer test, share md5sum for monitor container to check
-echo '*** Generating ' "$bigfile_size" ' file'
-dd if=/dev/urandom of="$nginx_html_path$bigfile_name"  bs="$bigfile_size"  count=1
-#md5sum /var/www/html/"$bigfile_name" >> "$tx_md5sumfile"
-md5sum < "$nginx_html_path$bigfile_name" > "$tx_md5sumfile"
-echo '*** Wrote MD5 sum to ' "$tx_md5sumfile"
-
-echo '*** Starting application...'
-sleep 0.5
-
-export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev"
-export LD_PRELOAD=./libzerotierintercept.so
-nginx
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/nginx.conf_ b/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/nginx.conf_
deleted file mode 100644
index 7069ef03..00000000
--- a/netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/nginx.conf_
+++ /dev/null
@@ -1,55 +0,0 @@
-# For more information on configuration, see:
-#   * Official English Documentation: http://nginx.org/en/docs/
-#   * Official Russian Documentation: http://nginx.org/ru/docs/
-
-user nginx;
-worker_processes auto;
-error_log /var/log/nginx/error.log;
-pid /run/nginx.pid;
-
-events {
-    worker_connections 1024;
-}
-
-http {
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
-
-    access_log  /var/log/nginx/access.log  main;
-
-    sendfile            on;
-    tcp_nopush          on;
-    tcp_nodelay         on;
-    keepalive_timeout   65;
-    types_hash_max_size 2048;
-
-    include             /etc/nginx/mime.types;
-    default_type        application/octet-stream;
-
-    # Load modular configuration files from the /etc/nginx/conf.d directory.
-    # See http://nginx.org/en/docs/ngx_core_module.html#include
-    # for more information.
-    include /etc/nginx/conf.d/*.conf;
-
-    server {
-        listen       80 default_server;
-        #listen       [::]:80 default_server;
-        server_name  _;
-        root         /usr/share/nginx/html;
-
-        # Load configuration files for the default server block.
-        include /etc/nginx/default.d/*.conf;
-
-        location / {
-        }
-
-        error_page 404 /404.html;
-            location = /40x.html {
-        }
-
-        error_page 500 502 503 504 /50x.html;
-            location = /50x.html {
-        }
-    }
-}
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_dockerfile b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_dockerfile
deleted file mode 100644
index d2d2a0cb..00000000
--- a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# ZT Network Containers Test Monitor
-FROM fedora:23
-MAINTAINER https://www.zerotier.com/
-
-EXPOSE 9993/udp
-
-# Add ZT files
-RUN mkdir -p /var/lib/zerotier-one/networks.d
-ADD monitor_identity.public /var/lib/zerotier-one/identity.public
-ADD monitor_identity.secret /var/lib/zerotier-one/identity.secret
-ADD *.conf /var/lib/zerotier-one/networks.d/
-ADD *.conf /
-ADD *.name /
-
-# Install LWIP library used by service
-ADD liblwip.so /var/lib/zerotier-one/liblwip.so
-
-ADD zerotier-one /
-ADD zerotier-cli /
-
-# Start ZeroTier-One
-ADD monitor_entrypoint.sh /monitor_entrypoint.sh
-RUN chmod -v +x /monitor_entrypoint.sh
-CMD ["./monitor_entrypoint.sh"]
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_entrypoint.sh b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_entrypoint.sh
deleted file mode 100644
index c8fca5a3..00000000
--- a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_entrypoint.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-
-export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
-
-
-# --- Test Parameters ---
-test_namefile=$(ls *.name)
-test_name="${test_namefile%.*}" # test network id
-nwconf=$(ls *.conf) # blank test network config file
-nwid="${nwconf%.*}" # test network id
-netcon_wait_time=35 # wait for test container to come online
-app_timeout_time=25 # app-specific timeout
-file_path=/opt/results/ # test result output file path (fs shared between host and containers)
-file_base="$test_name".txt # test result output file
-fail=FAIL. # appended to result file in event of failure
-ok=OK. # appended to result file in event of success
-tmp_ext=.tmp # temporary filetype used for sharing test data between containers
-address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
-bigfile_name=bigfile # large, random test transfer file
-rx_md5sumfile="$file_path"rx_"$bigfile_name"_md5sum"$tmp_ext"
-tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
-
-
-# --- Network Config ---
-echo '*** ZeroTier Network Containers Test Monitor'
-chown -R daemon /var/lib/zerotier-one
-chgrp -R daemon /var/lib/zerotier-one
-su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
-virtip4=""
-while [ -z "$virtip4" ]; do
-	sleep 0.2
-	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
-done
-echo '*** Starting Test...'
-echo '*** Up and running at' $virtip4 ' on network: ' $nwid
-echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
-sleep "$netcon_wait_time"s
-ncvirtip=$(<$address_file)
-
-
-# --- Test section ---
-echo '*** Curling from intercepted server at' $ncvirtip
-rm -rf "$file_path"*."$file_base"
-touch "$bigfile_name"
-
-# Perform test
-# curl --connect-timeout "$app_timeout_time" -v -o "$file_path$file_base" http://"$ncvirtip"/index.html
-# Large transfer test
-curl --connect-timeout "$app_timeout_time" -v -o "$bigfile_name" http://"$ncvirtip"/"$bigfile_name"
-
-# Check md5
-md5sum < "$bigfile_name" > "$rx_md5sumfile"
-rx_md5sum=$(<$rx_md5sumfile)
-tx_md5sum=$(<$tx_md5sumfile)
-
-echo '*** Comparing md5: ' "$rx_md5sum" ' and ' "$tx_md5sum"
-
-if [ "$rx_md5sum" != "$tx_md5sum" ]; 
-then
-	echo 'MD5 FAIL'
-	touch "$file_path$fail$test_name.txt"
-	printf 'Test: md5 sum did not match!\n' >> "$file_path$fail$test_name.txt"
-else
-	echo 'MD5 OK'
-	touch "$file_path$ok$test_name.txt"
-	printf 'Test: md5 sum ok!\n' >> "$file_path$ok$test_name.txt"
-	cat "$rx_md5sumfile" >> "$file_path$ok$test_name.txt"
-	cat "$tx_md5sumfile" >> "$file_path$ok$test_name.txt"
-fi
-
-
-
-
-
-
-
-
-
-
-
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile
deleted file mode 100644
index 05cd51fb..00000000
--- a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile
+++ /dev/null
@@ -1,40 +0,0 @@
-# ZT Network Containers Test
-FROM fedora:23
-MAINTAINER https://www.zerotier.com/
-
-# Install apps
-RUN yum -y update
-RUN yum -y install nginx-1:1.8.0-14.fc23.x86_64
-RUN yum clean all
-
-EXPOSE 9993/udp 80/udp
-
-# Add ZT files
-RUN mkdir -p /var/lib/zerotier-one/networks.d
-ADD netcon_identity.public /var/lib/zerotier-one/identity.public
-ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
-ADD *.conf /var/lib/zerotier-one/networks.d/
-ADD *.conf /
-ADD *.name /
-
-# Install LWIP library used by service
-ADD liblwip.so /var/lib/zerotier-one/liblwip.so
-
-# Install syscall intercept library
-ADD zerotier-intercept /
-ADD libzerotierintercept.so /
-RUN cp libzerotierintercept.so lib/libzerotierintercept.so
-RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
-RUN /usr/bin/install -c zerotier-intercept /usr/bin
-
-ADD zerotier-cli /
-ADD zerotier-netcon-service /
-
-# Install test scripts
-ADD netcon_entrypoint.sh /netcon_entrypoint.sh
-RUN chmod -v +x /netcon_entrypoint.sh
-
-ADD nginx.conf_ /
-
-# Start ZeroTier-One
-CMD ["./netcon_entrypoint.sh"]
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_entrypoint.sh
deleted file mode 100644
index b9b8ef71..00000000
--- a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_entrypoint.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
-
-
-# --- Test Parameters ---
-test_namefile=$(ls *.name)
-test_name="${test_namefile%.*}" # test network id
-nwconf=$(ls {*.conf,}) # blank test network config file
-nwid="${nwconf%.*}" # test network id
-file_path=/opt/results/ # test result output file path (fs shared between host and containers)
-file_base="$test_name".txt # test result output file
-tmp_ext=.tmp # temporary filetype used for sharing test data between containers
-address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
-bigfile_name=bigfile
-bigfile_size=10M # size of file we want to use for the test
-tx_md5sumfile="$file_path"tx_"$bigfile_name"_md5sum"$tmp_ext"
-
-
-# --- Network Config ---
-echo '*** ZeroTier Network Containers Test: ' "$test_name"
-chown -R daemon /var/lib/zerotier-one
-chgrp -R daemon /var/lib/zerotier-one
-su daemon -s /bin/bash -c '/zerotier-netcon-service -d -U -p9993 >>/tmp/zerotier-netcon-service.out 2>&1'
-virtip4=""
-while [ -z "$virtip4" ]; do
-	sleep 0.2
-	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
-	dev=`/zerotier-cli listnetworks | grep -F "" | cut -d ' ' -f 8 | cut -d "_" -f 2 | sed "s/^<dev>//" | tr '\n' '\0'`
-done
-echo '*** Up and running at' $virtip4 ' on network: ' $nwid
-echo '*** Writing address to ' "$address_file"
-echo $virtip4 > "$address_file"
-
-# --- Test section ---
-cp -f nginx.conf_ /etc/nginx/nginx.conf
-nginx_html_path=/usr/share/nginx/html/
-# Generate large random file for transfer test, share md5sum for monitor container to check
-echo '*** Generating ' "$bigfile_size" ' file'
-dd if=/dev/urandom of="$nginx_html_path$bigfile_name"  bs="$bigfile_size"  count=1
-#md5sum /var/www/html/"$bigfile_name" >> "$tx_md5sumfile"
-md5sum < "$nginx_html_path$bigfile_name" > "$tx_md5sumfile"
-echo '*** Wrote MD5 sum to ' "$tx_md5sumfile"
-
-echo '*** Starting application...'
-sleep 0.5
-
-export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev"
-export LD_PRELOAD=./libzerotierintercept.so
-nginx
diff --git a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/nginx.conf_ b/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/nginx.conf_
deleted file mode 100644
index 7069ef03..00000000
--- a/netcon/docker-test/nginx/nginx-1.8.0-14.fc23.x86_64/nginx.conf_
+++ /dev/null
@@ -1,55 +0,0 @@
-# For more information on configuration, see:
-#   * Official English Documentation: http://nginx.org/en/docs/
-#   * Official Russian Documentation: http://nginx.org/ru/docs/
-
-user nginx;
-worker_processes auto;
-error_log /var/log/nginx/error.log;
-pid /run/nginx.pid;
-
-events {
-    worker_connections 1024;
-}
-
-http {
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
-
-    access_log  /var/log/nginx/access.log  main;
-
-    sendfile            on;
-    tcp_nopush          on;
-    tcp_nodelay         on;
-    keepalive_timeout   65;
-    types_hash_max_size 2048;
-
-    include             /etc/nginx/mime.types;
-    default_type        application/octet-stream;
-
-    # Load modular configuration files from the /etc/nginx/conf.d directory.
-    # See http://nginx.org/en/docs/ngx_core_module.html#include
-    # for more information.
-    include /etc/nginx/conf.d/*.conf;
-
-    server {
-        listen       80 default_server;
-        #listen       [::]:80 default_server;
-        server_name  _;
-        root         /usr/share/nginx/html;
-
-        # Load configuration files for the default server block.
-        include /etc/nginx/default.d/*.conf;
-
-        location / {
-        }
-
-        error_page 404 /404.html;
-            location = /40x.html {
-        }
-
-        error_page 500 502 503 504 /50x.html;
-            location = /50x.html {
-        }
-    }
-}