This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.18
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.18 by this push:
new 3f33592b676 systemvm: vncport evaluation (#8369)
3f33592b676 is described below
commit 3f33592b676edf42bb361c9d3935e167ba173cd3
Author: dahn <[email protected]>
AuthorDate: Mon Feb 5 09:38:00 2024 +0100
systemvm: vncport evaluation (#8369)
* make sure env var gets evaluated by using double quotes
* delete unsused scripts
---
systemvm/agent/scripts/consoleproxy.sh | 33 ----------------------
systemvm/agent/scripts/secstorage.sh | 33 ----------------------
.../debian/opt/cloud/bin/setup/consoleproxy.sh | 2 +-
3 files changed, 1 insertion(+), 67 deletions(-)
diff --git a/systemvm/agent/scripts/consoleproxy.sh
b/systemvm/agent/scripts/consoleproxy.sh
deleted file mode 100755
index 1adbcc1a97e..00000000000
--- a/systemvm/agent/scripts/consoleproxy.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-
-#runs the console proxy as a standalone server
-#i.e., not in the system vm
-
-CP=./:./conf
-for file in *.jar
-do
- CP=${CP}:$file
-done
-keyvalues=
-#LOGHOME=/var/log/cloud/
-LOGHOME=$PWD/
-
-java -Djavax.net.ssl.trustStore=./certs/realhostip.keystore
-Dlog.home=$LOGHOME -cp $CP com.cloud.agent.AgentShell $keyvalues $@
diff --git a/systemvm/agent/scripts/secstorage.sh
b/systemvm/agent/scripts/secstorage.sh
deleted file mode 100755
index f210bb79615..00000000000
--- a/systemvm/agent/scripts/secstorage.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-
-
-#runs the secondary storage service as a standalone server
-#i.e., not in the system vm
-
-CP=./:./conf
-for file in *.jar
-do
- CP=${CP}:$file
-done
-keyvalues=
-#LOGHOME=/var/log/cloud/
-LOGHOME=$PWD/
-
-java -Djavax.net.ssl.trustStore=./certs/realhostip.keystore
-Dlog.home=$LOGHOME -cp $CP com.cloud.agent.AgentShell $keyvalues $@
diff --git a/systemvm/debian/opt/cloud/bin/setup/consoleproxy.sh
b/systemvm/debian/opt/cloud/bin/setup/consoleproxy.sh
index aa414c4117d..6d6b5d815bf 100755
--- a/systemvm/debian/opt/cloud/bin/setup/consoleproxy.sh
+++ b/systemvm/debian/opt/cloud/bin/setup/consoleproxy.sh
@@ -33,7 +33,7 @@ setup_console_proxy() {
echo "$public_ip $NAME" >> /etc/hosts
log_it "Applying iptables rule for VNC port ${VNCPORT}"
- sed -i 's/8080/${VNCPORT}/' /etc/iptables/rules.v4
+ sed -i "s/8080/${VNCPORT}/" /etc/iptables/rules.v4
echo "${VNCPORT}" > /root/vncport
log_it "Creating VNC port ${VNCPORT} file for VNC server configuration"
