From d9b12be697ed97e5a66c3912acc9a88d97f9ab8d Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Fri, 4 Dec 2015 12:39:54 -0800 Subject: ZT_NC_NWID patch + (WIP) test script modifications --- .../nginx/nginx-1.8.0-13.fc23.x86_64/netcon_entrypoint.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'netcon/docker-test/nginx/nginx-1.8.0-13.fc23.x86_64/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 index bf249222..12d0d998 100644 --- 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 @@ -35,13 +35,14 @@ echo $virtip4 > "$address_file" export ZT_NC_NWID=$dev # --- Test section --- +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=/var/www/html/"$bigfile_name" bs="$bigfile_size" count=1 +dd if=/dev/urandom of="$nginx_html_path$bigfile_name" bs="$bigfile_size" count=1 #md5sum /var/www/html/"$bigfile_name" >> "$tx_md5sumfile" -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 -zerotier-intercept nginx -p /var/www/html +zerotier-intercept nginx -- cgit v1.2.3