Parameter extraction path cleanup

storj-thirdparty · Jun 15, 2020 · 72be4e6 · 72be4e6
1 parent 0758313
commit 72be4e6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/shared/web/interface.php b/shared/web/interface.php
@@ -15,6 +15,7 @@
 	$stopScript     = $scriptsBase . DIRECTORY_SEPARATOR . 'gatewaystop.sh' ;
 	$updateScript = $scriptsBase . DIRECTORY_SEPARATOR . 'gatewayupdate.sh' ;
 	$isRunning      = $scriptsBase . DIRECTORY_SEPARATOR . 'isRunning.sh' ;
+	$parameters      = $scriptsBase . DIRECTORY_SEPARATOR . 'parameters.sh' ;
 	$dockerConfigFile = 'gateway/config.yaml';
 	logMessage("------------------------------------------------------------------------------");
 	logMessage("Platform Base($platformBase), ModuleBase($moduleBase) scriptBase($scriptsBase)");
@@ -167,7 +168,7 @@ function restartGateway() {
 	function configureGateway($port,$satellite,$apiKey,$passphrase){
 		global $file;
 		global $output;
-		global $configureScript, $moduleBase;
+		global $configureScript, $moduleBase, $parameters;
 		$jsonString = file_get_contents($file);
 	    $data = json_decode($jsonString, true);
 
@@ -191,9 +192,7 @@ function configureGateway($port,$satellite,$apiKey,$passphrase){
 	    $secretkey = "";
 
 	    header('Content-Type: text/plain');
-
-	    //$contents = shell_exec('export PATH=$PATH:/share/CACHEDEV1_DATA/.qpkg/container-station/bin ; docker run --rm -v $(pwd)/gateway:/root/.local/share/storj/gateway --entrypoint /bin/cat storjlabs/gateway:latest /root/.local/share/storj/gateway/config.yaml 2>&1 ');
-
+        $contents = shell_exec("/bin/bash $parameters 2>&1 ");
 
 	    $pattern = preg_quote($searchaccesskey, '/');
 	    $pattern = "/^\s*${pattern}\s*:.*\$/m";

diff --git a/shared/web/scripts/gatewayupdate.sh b/shared/web/scripts/gatewayupdate.sh
@@ -11,14 +11,6 @@ setupEnv
 
 LOG=$LOGFILE
 
-if [[ $# -lt 1 ]]
-then
-    msg="Not enough parameters to run gateway"
-    echo $msg
-    echo $msg >> $LOG
-    exit 1
-fi
-
 echo $(date) $PKGNAME  " docker container updater script running " >> $LOG
 
 export PATH=$PATH:${SYS_QPKG_INSTALL_PATH}/container-station/bin

diff --git a/shared/web/scripts/parameters.sh b/shared/web/scripts/parameters.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+# This script extracts the secret key and access key of  the gateway 
+function setupEnv() {
+    dirpath=$(dirname $0)
+    export PATH=$PATH:$dirpath
+    . common.sh
+}
+setupEnv 
+
+LOG=$LOGFILE
+echo $(date) "Gateway parameter extraction" >> $LOG
+export PATH=$PATH:${SYS_QPKG_INSTALL_PATH}/container-station/bin
+moduleBase=${WEB_PATH}/${PKGNAME}
+docker run --rm -v ${moduleBase}/gateway:/root/.local/share/storj/gateway --entrypoint /bin/cat storjlabs/gateway:latest /root/.local/share/storj/gateway/config.yaml
+