diff options
| author | Joseph Henry <josephjah@gmail.com> | 2015-12-21 05:03:26 -0800 |
|---|---|---|
| committer | Joseph Henry <josephjah@gmail.com> | 2015-12-21 05:03:26 -0800 |
| commit | c488fa8461272d7492eebfef26129e2d2ec1eddb (patch) | |
| tree | 9205b8c4d09d707880492dbe1e6368155e746d4a /netcon/docker-test/httpd | |
| parent | 608e059b180f2dd2b6d7dc0f8ef1bc5324039343 (diff) | |
| download | infinitytier-c488fa8461272d7492eebfef26129e2d2ec1eddb.tar.gz infinitytier-c488fa8461272d7492eebfef26129e2d2ec1eddb.zip | |
Tightening of RPC code
Diffstat (limited to 'netcon/docker-test/httpd')
3 files changed, 12 insertions, 9 deletions
diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh index 55ee1da3..688bd63b 100644 --- a/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh +++ b/netcon/docker-test/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh @@ -31,8 +31,6 @@ echo '--- Up and running at' $virtip4 ' on network: ' $nwid echo '*** Writing address to ' "$address_file" echo $virtip4 > "$address_file" -export ZT_NC_NWID=$dev - # --- Test section --- # Generate large random file for transfer test, share md5sum for monitor container to check echo '*** Generating ' "$bigfile_size" ' file' @@ -43,4 +41,7 @@ echo '*** Wrote MD5 sum to ' "$tx_md5sumfile" echo '*** Starting application...' sleep 0.5 rm -rf /run/httpd/* /tmp/httpd* -zerotier-intercept /usr/sbin/httpd -X + +export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev" +export LD_PRELOAD=./libzerotierintercept.so +/usr/sbin/httpd -X diff --git a/netcon/docker-test/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_entrypoint.sh b/netcon/docker-test/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_entrypoint.sh index 55ee1da3..688bd63b 100644 --- a/netcon/docker-test/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_entrypoint.sh +++ b/netcon/docker-test/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_entrypoint.sh @@ -31,8 +31,6 @@ echo '--- Up and running at' $virtip4 ' on network: ' $nwid echo '*** Writing address to ' "$address_file" echo $virtip4 > "$address_file" -export ZT_NC_NWID=$dev - # --- Test section --- # Generate large random file for transfer test, share md5sum for monitor container to check echo '*** Generating ' "$bigfile_size" ' file' @@ -43,4 +41,7 @@ echo '*** Wrote MD5 sum to ' "$tx_md5sumfile" echo '*** Starting application...' sleep 0.5 rm -rf /run/httpd/* /tmp/httpd* -zerotier-intercept /usr/sbin/httpd -X + +export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev" +export LD_PRELOAD=./libzerotierintercept.so +/usr/sbin/httpd -X diff --git a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_entrypoint.sh b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_entrypoint.sh index 7d0ebc89..d2ab248a 100644 --- a/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_entrypoint.sh +++ b/netcon/docker-test/httpd/httpd-2.4.17-3.fc23.x86_64/netcon_entrypoint.sh @@ -32,8 +32,6 @@ echo '*** Up and running at' $virtip4 ' on network: ' $nwid echo '*** Writing address to ' "$address_file" echo $virtip4 > "$address_file" -export ZT_NC_NWID=$dev - # --- Test section --- # Generate large random file for transfer test, share md5sum for monitor container to check echo '*** Generating ' "$bigfile_size" ' file' @@ -45,4 +43,7 @@ echo '*** Wrote MD5 sum to ' "$tx_md5sumfile" echo '*** Starting application...' sleep 0.5 rm -rf /run/httpd/* /tmp/httpd* -zerotier-intercept /usr/sbin/httpd -X + +export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev" +export LD_PRELOAD=./libzerotierintercept.so +/usr/sbin/httpd -X |