From 1a93ad4c7eceaaf1f7f942fd5abffcf51f0899cd Mon Sep 17 00:00:00 2001 From: Andy Witter Date: Tue, 22 Jan 2019 11:06:22 -0500 Subject: [PATCH] Fix BUG - hard coded nodename affecting pre-installation of certs for websockets to install and start correctly. --- templates/setup-functions | 4 ++-- templates/setup-head.sh | 1 + templates/setup.sh | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/templates/setup-functions b/templates/setup-functions index bd74423..5d3216d 100755 --- a/templates/setup-functions +++ b/templates/setup-functions @@ -57,7 +57,7 @@ if $APT_TOOL update echo echo "Installing Dependencies for Apache Web Sockets for web based staff client";sleep 2 echo "installing ssl key and cert...";sleep 4 | - tar zxvf $WD/next-brick02-head.tar.gz -C / etc/apache2/ssl/server.crt etc/apache2/ssl/server.key + tar zxvf $WD/$TARCHIVE -C / etc/apache2/ssl/server.crt etc/apache2/ssl/server.key gdebi --n libapache2-mod-websocket*.deb echo ### Configure Apache2 Web Sockets. @@ -86,7 +86,7 @@ EOF echo echo "Installing OpenSRF:";sleep 2 - tar zxvf $WD/next-brick02-head.tar.gz -C / etc/sudoers.d/opensrf + tar zxvf $WD/$TARCHIVE -C / etc/sudoers.d/opensrf gdebi --n opensrf*.deb service apache2-websockets start diff --git a/templates/setup-head.sh b/templates/setup-head.sh index 9cf62c5..55f0961 100755 --- a/templates/setup-head.sh +++ b/templates/setup-head.sh @@ -1,6 +1,7 @@ #!/bin/bash export WD=$(dirname $(readlink -f $0)) +TARCHIVE="head_file.tar.gz" . "$WD/setup-vars" . "$WD/setup-functions" diff --git a/templates/setup.sh b/templates/setup.sh index 2255fab..a8f9f78 100755 --- a/templates/setup.sh +++ b/templates/setup.sh @@ -3,6 +3,7 @@ ###TODO: export GenaSYS version to install logs. export WD=$(dirname $(readlink -f $0)) +TARCHIVE="tar_file.tar.gz" . "$WD/setup-vars" . "$WD/setup-functions" -- 2.11.0