etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

systemvm: vncport evaluation (#8369) 

* make sure env var gets evaluated by using double quotes

* delete unsused scripts
This commit is contained in:
dahn 2024-02-05 09:38:00 +01:00 committed by GitHub
parent 1c98b5a4e5
commit 3f33592b67
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 1 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
systemvm/agent/scripts/consoleproxy.sh
View File

@ -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 $@

33
systemvm/agent/scripts/secstorage.sh
View File

@ -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 $@

2
systemvm/debian/opt/cloud/bin/setup/consoleproxy.sh
View File

@ -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"