Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2E8D8200D5A for ; Wed, 29 Nov 2017 15:12:11 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 2D9E8160BF6; Wed, 29 Nov 2017 14:12:11 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0866C160C16 for ; Wed, 29 Nov 2017 15:12:08 +0100 (CET) Received: (qmail 70616 invoked by uid 500); 29 Nov 2017 14:12:08 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 70607 invoked by uid 99); 29 Nov 2017 14:12:08 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Nov 2017 14:12:08 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id A8A6F806C3; Wed, 29 Nov 2017 14:12:06 +0000 (UTC) Date: Wed, 29 Nov 2017 14:12:06 +0000 To: "commits@cloudstack.apache.org" Subject: [cloudstack] 02/02: refactor files, remove old cruft MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: bhaisaab@apache.org In-Reply-To: <151196472474.1621.12117007692157770390@gitbox.apache.org> References: <151196472474.1621.12117007692157770390@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: cloudstack X-Git-Refname: refs/heads/debian9-systemvmtemplate X-Git-Reftype: branch X-Git-Rev: d4ad8663d435b45c43d1d052dbb97fa251496bef X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20171129141206.A8A6F806C3@gitbox.apache.org> archived-at: Wed, 29 Nov 2017 14:12:11 -0000 This is an automated email from the ASF dual-hosted git repository. bhaisaab pushed a commit to branch debian9-systemvmtemplate in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit d4ad8663d435b45c43d1d052dbb97fa251496bef Author: Rohit Yadav AuthorDate: Wed Nov 29 18:37:56 2017 +0530 refactor files, remove old cruft Signed-off-by: Rohit Yadav --- .../tomcatconf/commands-simulator.properties.in | 21 ------------- client/pom.xml | 1 - pom.xml | 34 ++++----------------- systemvm/{ => agent}/certs/localhost.crt | 0 systemvm/{ => agent}/certs/localhost.key | 0 systemvm/{ => agent}/certs/realhostip.crt | 0 systemvm/{ => agent}/certs/realhostip.csr | 0 systemvm/{ => agent}/certs/realhostip.key | 0 systemvm/{ => agent}/certs/realhostip.keystore | Bin systemvm/{ => agent}/conf/agent.properties | 0 systemvm/{ => agent}/conf/consoleproxy.properties | 0 systemvm/{ => agent}/conf/environment.properties | 0 systemvm/{ => agent}/conf/log4j-cloud.xml | 0 systemvm/{ => agent}/css/ajaxviewer.css | 0 systemvm/{ => agent}/css/logger.css | 0 systemvm/{ => agent}/images/back.gif | Bin systemvm/{ => agent}/images/bright-green.png | Bin systemvm/{ => agent}/images/cad.gif | Bin systemvm/{ => agent}/images/cannotconnect.jpg | Bin systemvm/{ => agent}/images/clr_button.gif | Bin systemvm/{ => agent}/images/clr_button_hover.gif | Bin systemvm/{ => agent}/images/dot.cur | Bin systemvm/{ => agent}/images/gray-green.png | Bin systemvm/{ => agent}/images/grid_headerbg.gif | Bin systemvm/{ => agent}/images/left.png | Bin systemvm/{ => agent}/images/minimize_button.gif | Bin .../{ => agent}/images/minimize_button_hover.gif | Bin systemvm/{ => agent}/images/notready.jpg | Bin systemvm/{ => agent}/images/play_button.gif | Bin systemvm/{ => agent}/images/play_button_hover.gif | Bin systemvm/{ => agent}/images/right.png | Bin systemvm/{ => agent}/images/right2.png | Bin systemvm/{ => agent}/images/shrink_button.gif | Bin .../{ => agent}/images/shrink_button_hover.gif | Bin systemvm/{ => agent}/images/stop_button.gif | Bin systemvm/{ => agent}/images/stop_button_hover.gif | Bin systemvm/{ => agent}/images/winlog.png | Bin systemvm/{ => agent}/js/ajaxkeys.js | 0 systemvm/{ => agent}/js/ajaxviewer.js | 0 systemvm/{ => agent}/js/cloud.logger.js | 0 systemvm/{ => agent}/js/handler.js | 0 systemvm/{ => agent}/js/jquery.flot.navigate.js | 0 systemvm/{ => agent}/js/jquery.js | 0 systemvm/{ => agent}/scripts/_run.sh | 0 systemvm/{ => agent}/scripts/config_auth.sh | 0 systemvm/{ => agent}/scripts/config_ssl.sh | 0 systemvm/{ => agent}/scripts/consoleproxy.sh | 0 systemvm/{ => agent}/scripts/ipfirewall.sh | 0 systemvm/{ => agent}/scripts/run-proxy.sh | 0 systemvm/{ => agent}/scripts/run.sh | 0 systemvm/{ => agent}/scripts/secstorage.sh | 0 systemvm/{ => agent}/scripts/ssvm-check.sh | 0 systemvm/{ => agent}/scripts/utils.sh | 0 systemvm/{ => agent}/ui/viewer-bad-sid.ftl | 0 systemvm/{ => agent}/ui/viewer-connect-failed.ftl | 0 systemvm/{ => agent}/ui/viewer-update.ftl | 0 systemvm/{ => agent}/ui/viewer.ftl | 0 systemvm/patches/debian/config/etc/chef/node.json | 5 --- systemvm/patches/debian/config/etc/chef/solo.rb | 21 ------------- .../debian/{config => }/etc/apache2/httpd.conf | 0 .../debian/{config => }/etc/apache2/vhost.template | 0 .../debian/{config => }/etc/cloud-nic.rules | 0 .../debian/{config => }/etc/dnsmasq.conf.tmpl | 0 .../debian/{config => }/etc/haproxy/haproxy.cfg | 0 .../{config => }/etc/init.d/cloud-early-config | 0 .../{config => }/etc/init.d/cloud-passwd-srvr | 0 .../etc/iptables/iptables-consoleproxy | 0 .../{config => }/etc/iptables/iptables-dhcpsrvr | 0 .../{config => }/etc/iptables/iptables-elbvm | 0 .../{config => }/etc/iptables/iptables-ilbvm | 0 .../{config => }/etc/iptables/iptables-router | 0 .../{config => }/etc/iptables/iptables-secstorage | 0 .../{config => }/etc/iptables/iptables-vpcrouter | 0 .../{config => }/etc/iptables/rt_tables_init | 0 .../patches/debian/{config => }/etc/iptables/rules | 0 .../patches/debian/{config => }/etc/logrotate.conf | 0 .../debian/{config => }/etc/logrotate.d/apache2 | 0 .../debian/{config => }/etc/logrotate.d/cloud | 0 .../debian/{config => }/etc/logrotate.d/conntrackd | 0 .../debian/{config => }/etc/logrotate.d/dnsmasq | 0 .../debian/{config => }/etc/logrotate.d/haproxy | 0 .../debian/{config => }/etc/logrotate.d/ppp | 0 .../debian/{config => }/etc/logrotate.d/rsyslog | 0 .../{config => }/etc/modprobe.d/aesni_intel.conf | 0 .../debian/{config => }/etc/modprobe.d/pcspkr.conf | 0 .../debian/{config => }/etc/profile.d/cloud.sh | 0 systemvm/patches/debian/{config => }/etc/rc.local | 0 .../patches/debian/{config => }/etc/rsyslog.conf | 0 .../debian/{config => }/etc/ssh/sshd_config | 6 ++-- .../patches/debian/{config => }/etc/sysctl.conf | 0 .../debian/{config => }/etc/vpcdnsmasq.conf | 0 .../{config => }/opt/cloud/bin/baremetal-vr.py | 0 .../{config => }/opt/cloud/bin/baremetal_snat.sh | 0 .../{config => }/opt/cloud/bin/bumpup_priority.sh | 0 .../{config => }/opt/cloud/bin/checkbatchs2svpn.sh | 0 .../{config => }/opt/cloud/bin/checkrouter.sh | 0 .../{config => }/opt/cloud/bin/checks2svpn.sh | 0 .../debian/{config => }/opt/cloud/bin/cloud-nic.sh | 0 .../debian/{config => }/opt/cloud/bin/configure.py | 0 .../{config => }/opt/cloud/bin/cs/CsAddress.py | 0 .../debian/{config => }/opt/cloud/bin/cs/CsApp.py | 0 .../{config => }/opt/cloud/bin/cs/CsConfig.py | 0 .../{config => }/opt/cloud/bin/cs/CsDatabag.py | 0 .../debian/{config => }/opt/cloud/bin/cs/CsDhcp.py | 0 .../debian/{config => }/opt/cloud/bin/cs/CsFile.py | 0 .../opt/cloud/bin/cs/CsGuestNetwork.py | 0 .../{config => }/opt/cloud/bin/cs/CsHelper.py | 0 .../opt/cloud/bin/cs/CsLoadBalancer.py | 0 .../{config => }/opt/cloud/bin/cs/CsMonitor.py | 0 .../{config => }/opt/cloud/bin/cs/CsNetfilter.py | 0 .../{config => }/opt/cloud/bin/cs/CsProcess.py | 0 .../{config => }/opt/cloud/bin/cs/CsRedundant.py | 0 .../{config => }/opt/cloud/bin/cs/CsRoute.py | 0 .../debian/{config => }/opt/cloud/bin/cs/CsRule.py | 0 .../opt/cloud/bin/cs/CsStaticRoutes.py | 0 .../{config => }/opt/cloud/bin/cs/__init__.py | 0 .../{config => }/opt/cloud/bin/cs_cmdline.py | 0 .../debian/{config => }/opt/cloud/bin/cs_dhcp.py | 0 .../{config => }/opt/cloud/bin/cs_firewallrules.py | 0 .../opt/cloud/bin/cs_forwardingrules.py | 0 .../{config => }/opt/cloud/bin/cs_guestnetwork.py | 0 .../debian/{config => }/opt/cloud/bin/cs_ip.py | 0 .../{config => }/opt/cloud/bin/cs_loadbalancer.py | 0 .../opt/cloud/bin/cs_monitorservice.py | 0 .../{config => }/opt/cloud/bin/cs_network_acl.py | 0 .../opt/cloud/bin/cs_remoteaccessvpn.py | 0 .../{config => }/opt/cloud/bin/cs_site2sitevpn.py | 0 .../{config => }/opt/cloud/bin/cs_staticroutes.py | 0 .../debian/{config => }/opt/cloud/bin/cs_vmdata.py | 0 .../debian/{config => }/opt/cloud/bin/cs_vmp.py | 0 .../{config => }/opt/cloud/bin/cs_vpnusers.py | 0 .../debian/{config => }/opt/cloud/bin/dnsmasq.sh | 0 .../debian/{config => }/opt/cloud/bin/edithosts.sh | 0 .../{config => }/opt/cloud/bin/getRouterAlerts.sh | 0 .../opt/cloud/bin/get_template_version.sh | 0 .../debian/{config => }/opt/cloud/bin/ilb.sh | 0 .../debian/{config => }/opt/cloud/bin/ipassoc.sh | 0 .../{config => }/opt/cloud/bin/ipsectunnel.sh | 0 .../debian/{config => }/opt/cloud/bin/line_edit.py | 0 .../{config => }/opt/cloud/bin/loadbalancer.sh | 0 .../debian/{config => }/opt/cloud/bin/master.py | 0 .../debian/{config => }/opt/cloud/bin/merge.py | 0 .../{config => }/opt/cloud/bin/monitor_service.sh | 0 .../debian/{config => }/opt/cloud/bin/netusage.sh | 0 .../{config => }/opt/cloud/bin/passwd_server | 0 .../{config => }/opt/cloud/bin/passwd_server_ip | 0 .../{config => }/opt/cloud/bin/passwd_server_ip.py | 0 .../{config => }/opt/cloud/bin/prepare_pxe.sh | 0 .../{config => }/opt/cloud/bin/savepassword.sh | 0 .../{config => }/opt/cloud/bin/set_redundant.py | 0 .../{config => }/opt/cloud/bin/setup/common.sh | 0 .../opt/cloud/bin/setup/consoleproxy.sh | 0 .../{config => }/opt/cloud/bin/setup/default.sh | 0 .../{config => }/opt/cloud/bin/setup/dhcpsrvr.sh | 0 .../{config => }/opt/cloud/bin/setup/elbvm.sh | 0 .../{config => }/opt/cloud/bin/setup/ilbvm.sh | 0 .../opt/cloud/bin/setup/patchsystemvm.sh | 4 +-- .../{config => }/opt/cloud/bin/setup/router.sh | 0 .../{config => }/opt/cloud/bin/setup/secstorage.sh | 0 .../{config => }/opt/cloud/bin/setup/vpcrouter.sh | 0 .../{config => }/opt/cloud/bin/update_config.py | 0 .../debian/{config => }/opt/cloud/bin/vmdata.py | 0 .../debian/{config => }/opt/cloud/bin/vpc_func.sh | 0 .../{config => }/opt/cloud/bin/vpc_netusage.sh | 0 .../{config => }/opt/cloud/bin/vpc_passwd_server | 0 .../debian/{config => }/opt/cloud/bin/vpc_snat.sh | 0 .../{config => }/opt/cloud/bin/vpc_staticroute.sh | 0 .../debian/{config => }/opt/cloud/bin/vr_cfg.sh | 0 .../debian/{config => }/opt/cloud/templates/README | 0 .../opt/cloud/templates/arping_gateways.sh.templ | 0 .../opt/cloud/templates/check_bumpup.sh | 0 .../opt/cloud/templates/check_heartbeat.sh.templ | 0 .../opt/cloud/templates/checkrouter.sh.templ | 0 .../opt/cloud/templates/conntrackd.conf.templ | 0 .../opt/cloud/templates/heartbeat.sh.templ | 0 .../opt/cloud/templates/keepalived.conf.templ | 0 .../debian/{config => }/opt/cloud/testdata/README | 0 .../{config => }/opt/cloud/testdata/acl0001.json | 0 .../{config => }/opt/cloud/testdata/dhcp0001.json | 0 .../{config => }/opt/cloud/testdata/gn0001.json | 0 .../{config => }/opt/cloud/testdata/ips0001.json | 0 .../{config => }/opt/cloud/testdata/ips0002.json | 0 .../{config => }/opt/cloud/testdata/ips0003.json | 0 .../{config => }/opt/cloud/testdata/s2s0001.json | 0 .../opt/cloud/bin => opt/cloud/testdata}/test.sh | 0 .../{config => }/opt/cloud/testdata/vmp0001.json | 0 .../debian/{config => }/root/.ssh/authorized_keys | 0 .../debian/{config => }/root/clearUsageRules.sh | 0 systemvm/patches/debian/{config => }/root/func.sh | 0 .../debian/{config => }/root/monitorServices.py | 0 .../patches/debian/{config => }/root/reconfigLB.sh | 0 .../{config => }/var/www/html/latest/.htaccess | 0 .../{config => }/var/www/html/userdata/.htaccess | 0 .../{test/python => patches/test}/TestCsAddress.py | 0 .../{test/python => patches/test}/TestCsApp.py | 0 .../{test/python => patches/test}/TestCsCmdLine.py | 0 .../{test/python => patches/test}/TestCsConfig.py | 0 .../{test/python => patches/test}/TestCsDatabag.py | 0 .../{test/python => patches/test}/TestCsDhcp.py | 0 .../{test/python => patches/test}/TestCsFile.py | 0 .../python => patches/test}/TestCsGuestNetwork.py | 0 .../{test/python => patches/test}/TestCsHelper.py | 0 .../python => patches/test}/TestCsInterface.py | 0 .../python => patches/test}/TestCsNetfilter.py | 0 .../{test/python => patches/test}/TestCsProcess.py | 0 .../python => patches/test}/TestCsRedundant.py | 0 .../{test/python => patches/test}/TestCsRoute.py | 0 .../{test/python => patches/test}/TestCsRule.py | 0 systemvm/{test/python => patches/test}/runtests.sh | 2 +- systemvm/patches/{debian => }/vpn/etc/ipsec.conf | 0 .../patches/{debian => }/vpn/etc/ipsec.d/l2tp.conf | 0 .../patches/{debian => }/vpn/etc/ipsec.secrets | 0 .../{debian => }/vpn/etc/ppp/options.xl2tpd | 0 .../{debian => }/vpn/etc/xl2tpd/xl2tpd.conf | 0 .../{debian => }/vpn/opt/cloud/bin/vpn_l2tp.sh | 0 systemvm/pom.xml | 15 +++++---- systemvm/scripts/run.bat | 18 ----------- ...escriptor.xml => systemvm-agent-descriptor.xml} | 16 +++++----- 218 files changed, 27 insertions(+), 116 deletions(-) diff --git a/agent-simulator/tomcatconf/commands-simulator.properties.in b/agent-simulator/tomcatconf/commands-simulator.properties.in deleted file mode 100644 index 4350bb7..0000000 --- a/agent-simulator/tomcatconf/commands-simulator.properties.in +++ /dev/null @@ -1,21 +0,0 @@ -# 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. - - -configureSimulator=com.cloud.api.commands.ConfigureSimulatorCmd;1 -querySimulatorMock=com.cloud.api.commands.QuerySimulatorMockCmd;1 -cleanupSimulatorMock=com.cloud.api.commands.CleanupSimulatorMockCmd;1 diff --git a/client/pom.xml b/client/pom.xml index 63980b9..6bf0552 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -798,7 +798,6 @@ - diff --git a/pom.xml b/pom.xml index 08aa81e..d4d1a37 100644 --- a/pom.xml +++ b/pom.xml @@ -925,34 +925,12 @@ ui/lib/reset.css ui/lib/require.js utils/testsmallfileinactive - systemvm/conf/agent.properties - systemvm/conf/environment.properties - systemvm/js/jquery.js - systemvm/js/jquery.flot.navigate.js - systemvm/patches/debian/config/root/.ssh/authorized_keys - systemvm/patches/debian/config/etc/apache2/httpd.conf - systemvm/patches/debian/config/etc/apache2/vhost.template - systemvm/patches/debian/config/etc/dnsmasq.conf.tmpl - systemvm/patches/debian/config/etc/vpcdnsmasq.conf - systemvm/patches/debian/config/etc/ssh/sshd_config - systemvm/patches/debian/config/etc/rsyslog.conf - systemvm/patches/debian/config/etc/logrotate.conf - systemvm/patches/debian/config/etc/logrotate.d/* - systemvm/patches/debian/config/etc/sysctl.conf - systemvm/patches/debian/config/root/redundant_router/keepalived.conf.templ - systemvm/patches/debian/config/root/redundant_router/arping_gateways.sh.templ - systemvm/patches/debian/config/root/redundant_router/conntrackd.conf.templ - systemvm/patches/debian/vpn/etc/ipsec.conf - systemvm/patches/debian/vpn/etc/ppp/options.xl2tpd - systemvm/patches/debian/vpn/etc/xl2tpd/xl2tpd.conf - systemvm/patches/debian/vpn/etc/ipsec.secrets - systemvm/patches/debian/config/etc/haproxy/haproxy.cfg - systemvm/patches/debian/config/etc/cloud-nic.rules - systemvm/patches/debian/config/etc/modprobe.d/aesni_intel - systemvm/patches/debian/config/etc/rc.local - systemvm/patches/debian/config/var/www/html/userdata/.htaccess - systemvm/patches/debian/config/var/www/html/latest/.htaccess - systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf + systemvm/agent/conf/agent.properties + systemvm/agent/conf/environment.properties + systemvm/agent/js/jquery.js + systemvm/agent/js/jquery.flot.navigate.js + systemvm/patches/debian/** + systemvm/patches/vpn/** tools/transifex/.tx/config tools/logo/apache_cloudstack.png tools/marvin/marvin/sandbox/advanced/sandbox.cfg diff --git a/systemvm/certs/localhost.crt b/systemvm/agent/certs/localhost.crt similarity index 100% rename from systemvm/certs/localhost.crt rename to systemvm/agent/certs/localhost.crt diff --git a/systemvm/certs/localhost.key b/systemvm/agent/certs/localhost.key similarity index 100% rename from systemvm/certs/localhost.key rename to systemvm/agent/certs/localhost.key diff --git a/systemvm/certs/realhostip.crt b/systemvm/agent/certs/realhostip.crt similarity index 100% rename from systemvm/certs/realhostip.crt rename to systemvm/agent/certs/realhostip.crt diff --git a/systemvm/certs/realhostip.csr b/systemvm/agent/certs/realhostip.csr similarity index 100% rename from systemvm/certs/realhostip.csr rename to systemvm/agent/certs/realhostip.csr diff --git a/systemvm/certs/realhostip.key b/systemvm/agent/certs/realhostip.key similarity index 100% rename from systemvm/certs/realhostip.key rename to systemvm/agent/certs/realhostip.key diff --git a/systemvm/certs/realhostip.keystore b/systemvm/agent/certs/realhostip.keystore similarity index 100% rename from systemvm/certs/realhostip.keystore rename to systemvm/agent/certs/realhostip.keystore diff --git a/systemvm/conf/agent.properties b/systemvm/agent/conf/agent.properties similarity index 100% rename from systemvm/conf/agent.properties rename to systemvm/agent/conf/agent.properties diff --git a/systemvm/conf/consoleproxy.properties b/systemvm/agent/conf/consoleproxy.properties similarity index 100% rename from systemvm/conf/consoleproxy.properties rename to systemvm/agent/conf/consoleproxy.properties diff --git a/systemvm/conf/environment.properties b/systemvm/agent/conf/environment.properties similarity index 100% rename from systemvm/conf/environment.properties rename to systemvm/agent/conf/environment.properties diff --git a/systemvm/conf/log4j-cloud.xml b/systemvm/agent/conf/log4j-cloud.xml similarity index 100% rename from systemvm/conf/log4j-cloud.xml rename to systemvm/agent/conf/log4j-cloud.xml diff --git a/systemvm/css/ajaxviewer.css b/systemvm/agent/css/ajaxviewer.css similarity index 100% rename from systemvm/css/ajaxviewer.css rename to systemvm/agent/css/ajaxviewer.css diff --git a/systemvm/css/logger.css b/systemvm/agent/css/logger.css similarity index 100% rename from systemvm/css/logger.css rename to systemvm/agent/css/logger.css diff --git a/systemvm/images/back.gif b/systemvm/agent/images/back.gif similarity index 100% rename from systemvm/images/back.gif rename to systemvm/agent/images/back.gif diff --git a/systemvm/images/bright-green.png b/systemvm/agent/images/bright-green.png similarity index 100% rename from systemvm/images/bright-green.png rename to systemvm/agent/images/bright-green.png diff --git a/systemvm/images/cad.gif b/systemvm/agent/images/cad.gif similarity index 100% rename from systemvm/images/cad.gif rename to systemvm/agent/images/cad.gif diff --git a/systemvm/images/cannotconnect.jpg b/systemvm/agent/images/cannotconnect.jpg similarity index 100% rename from systemvm/images/cannotconnect.jpg rename to systemvm/agent/images/cannotconnect.jpg diff --git a/systemvm/images/clr_button.gif b/systemvm/agent/images/clr_button.gif similarity index 100% rename from systemvm/images/clr_button.gif rename to systemvm/agent/images/clr_button.gif diff --git a/systemvm/images/clr_button_hover.gif b/systemvm/agent/images/clr_button_hover.gif similarity index 100% rename from systemvm/images/clr_button_hover.gif rename to systemvm/agent/images/clr_button_hover.gif diff --git a/systemvm/images/dot.cur b/systemvm/agent/images/dot.cur similarity index 100% rename from systemvm/images/dot.cur rename to systemvm/agent/images/dot.cur diff --git a/systemvm/images/gray-green.png b/systemvm/agent/images/gray-green.png similarity index 100% rename from systemvm/images/gray-green.png rename to systemvm/agent/images/gray-green.png diff --git a/systemvm/images/grid_headerbg.gif b/systemvm/agent/images/grid_headerbg.gif similarity index 100% rename from systemvm/images/grid_headerbg.gif rename to systemvm/agent/images/grid_headerbg.gif diff --git a/systemvm/images/left.png b/systemvm/agent/images/left.png similarity index 100% rename from systemvm/images/left.png rename to systemvm/agent/images/left.png diff --git a/systemvm/images/minimize_button.gif b/systemvm/agent/images/minimize_button.gif similarity index 100% rename from systemvm/images/minimize_button.gif rename to systemvm/agent/images/minimize_button.gif diff --git a/systemvm/images/minimize_button_hover.gif b/systemvm/agent/images/minimize_button_hover.gif similarity index 100% rename from systemvm/images/minimize_button_hover.gif rename to systemvm/agent/images/minimize_button_hover.gif diff --git a/systemvm/images/notready.jpg b/systemvm/agent/images/notready.jpg similarity index 100% rename from systemvm/images/notready.jpg rename to systemvm/agent/images/notready.jpg diff --git a/systemvm/images/play_button.gif b/systemvm/agent/images/play_button.gif similarity index 100% rename from systemvm/images/play_button.gif rename to systemvm/agent/images/play_button.gif diff --git a/systemvm/images/play_button_hover.gif b/systemvm/agent/images/play_button_hover.gif similarity index 100% rename from systemvm/images/play_button_hover.gif rename to systemvm/agent/images/play_button_hover.gif diff --git a/systemvm/images/right.png b/systemvm/agent/images/right.png similarity index 100% rename from systemvm/images/right.png rename to systemvm/agent/images/right.png diff --git a/systemvm/images/right2.png b/systemvm/agent/images/right2.png similarity index 100% rename from systemvm/images/right2.png rename to systemvm/agent/images/right2.png diff --git a/systemvm/images/shrink_button.gif b/systemvm/agent/images/shrink_button.gif similarity index 100% rename from systemvm/images/shrink_button.gif rename to systemvm/agent/images/shrink_button.gif diff --git a/systemvm/images/shrink_button_hover.gif b/systemvm/agent/images/shrink_button_hover.gif similarity index 100% rename from systemvm/images/shrink_button_hover.gif rename to systemvm/agent/images/shrink_button_hover.gif diff --git a/systemvm/images/stop_button.gif b/systemvm/agent/images/stop_button.gif similarity index 100% rename from systemvm/images/stop_button.gif rename to systemvm/agent/images/stop_button.gif diff --git a/systemvm/images/stop_button_hover.gif b/systemvm/agent/images/stop_button_hover.gif similarity index 100% rename from systemvm/images/stop_button_hover.gif rename to systemvm/agent/images/stop_button_hover.gif diff --git a/systemvm/images/winlog.png b/systemvm/agent/images/winlog.png similarity index 100% rename from systemvm/images/winlog.png rename to systemvm/agent/images/winlog.png diff --git a/systemvm/js/ajaxkeys.js b/systemvm/agent/js/ajaxkeys.js similarity index 100% rename from systemvm/js/ajaxkeys.js rename to systemvm/agent/js/ajaxkeys.js diff --git a/systemvm/js/ajaxviewer.js b/systemvm/agent/js/ajaxviewer.js similarity index 100% rename from systemvm/js/ajaxviewer.js rename to systemvm/agent/js/ajaxviewer.js diff --git a/systemvm/js/cloud.logger.js b/systemvm/agent/js/cloud.logger.js similarity index 100% rename from systemvm/js/cloud.logger.js rename to systemvm/agent/js/cloud.logger.js diff --git a/systemvm/js/handler.js b/systemvm/agent/js/handler.js similarity index 100% rename from systemvm/js/handler.js rename to systemvm/agent/js/handler.js diff --git a/systemvm/js/jquery.flot.navigate.js b/systemvm/agent/js/jquery.flot.navigate.js similarity index 100% rename from systemvm/js/jquery.flot.navigate.js rename to systemvm/agent/js/jquery.flot.navigate.js diff --git a/systemvm/js/jquery.js b/systemvm/agent/js/jquery.js similarity index 100% rename from systemvm/js/jquery.js rename to systemvm/agent/js/jquery.js diff --git a/systemvm/scripts/_run.sh b/systemvm/agent/scripts/_run.sh similarity index 100% rename from systemvm/scripts/_run.sh rename to systemvm/agent/scripts/_run.sh diff --git a/systemvm/scripts/config_auth.sh b/systemvm/agent/scripts/config_auth.sh similarity index 100% rename from systemvm/scripts/config_auth.sh rename to systemvm/agent/scripts/config_auth.sh diff --git a/systemvm/scripts/config_ssl.sh b/systemvm/agent/scripts/config_ssl.sh similarity index 100% rename from systemvm/scripts/config_ssl.sh rename to systemvm/agent/scripts/config_ssl.sh diff --git a/systemvm/scripts/consoleproxy.sh b/systemvm/agent/scripts/consoleproxy.sh similarity index 100% rename from systemvm/scripts/consoleproxy.sh rename to systemvm/agent/scripts/consoleproxy.sh diff --git a/systemvm/scripts/ipfirewall.sh b/systemvm/agent/scripts/ipfirewall.sh similarity index 100% rename from systemvm/scripts/ipfirewall.sh rename to systemvm/agent/scripts/ipfirewall.sh diff --git a/systemvm/scripts/run-proxy.sh b/systemvm/agent/scripts/run-proxy.sh similarity index 100% rename from systemvm/scripts/run-proxy.sh rename to systemvm/agent/scripts/run-proxy.sh diff --git a/systemvm/scripts/run.sh b/systemvm/agent/scripts/run.sh similarity index 100% rename from systemvm/scripts/run.sh rename to systemvm/agent/scripts/run.sh diff --git a/systemvm/scripts/secstorage.sh b/systemvm/agent/scripts/secstorage.sh similarity index 100% rename from systemvm/scripts/secstorage.sh rename to systemvm/agent/scripts/secstorage.sh diff --git a/systemvm/scripts/ssvm-check.sh b/systemvm/agent/scripts/ssvm-check.sh similarity index 100% rename from systemvm/scripts/ssvm-check.sh rename to systemvm/agent/scripts/ssvm-check.sh diff --git a/systemvm/scripts/utils.sh b/systemvm/agent/scripts/utils.sh similarity index 100% rename from systemvm/scripts/utils.sh rename to systemvm/agent/scripts/utils.sh diff --git a/systemvm/ui/viewer-bad-sid.ftl b/systemvm/agent/ui/viewer-bad-sid.ftl similarity index 100% rename from systemvm/ui/viewer-bad-sid.ftl rename to systemvm/agent/ui/viewer-bad-sid.ftl diff --git a/systemvm/ui/viewer-connect-failed.ftl b/systemvm/agent/ui/viewer-connect-failed.ftl similarity index 100% rename from systemvm/ui/viewer-connect-failed.ftl rename to systemvm/agent/ui/viewer-connect-failed.ftl diff --git a/systemvm/ui/viewer-update.ftl b/systemvm/agent/ui/viewer-update.ftl similarity index 100% rename from systemvm/ui/viewer-update.ftl rename to systemvm/agent/ui/viewer-update.ftl diff --git a/systemvm/ui/viewer.ftl b/systemvm/agent/ui/viewer.ftl similarity index 100% rename from systemvm/ui/viewer.ftl rename to systemvm/agent/ui/viewer.ftl diff --git a/systemvm/patches/debian/config/etc/chef/node.json b/systemvm/patches/debian/config/etc/chef/node.json deleted file mode 100644 index 1b23e33..0000000 --- a/systemvm/patches/debian/config/etc/chef/node.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "run_list": [ - "recipe[csip::default]" - ] -} diff --git a/systemvm/patches/debian/config/etc/chef/solo.rb b/systemvm/patches/debian/config/etc/chef/solo.rb deleted file mode 100644 index 3207dd1..0000000 --- a/systemvm/patches/debian/config/etc/chef/solo.rb +++ /dev/null @@ -1,21 +0,0 @@ -# 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. - -data_bags_path "/var/chef/data_bags" -cookbook_path "/var/chef/cookbooks" -log_level :debug -log_location STDOUT diff --git a/systemvm/patches/debian/config/etc/apache2/httpd.conf b/systemvm/patches/debian/etc/apache2/httpd.conf similarity index 100% rename from systemvm/patches/debian/config/etc/apache2/httpd.conf rename to systemvm/patches/debian/etc/apache2/httpd.conf diff --git a/systemvm/patches/debian/config/etc/apache2/vhost.template b/systemvm/patches/debian/etc/apache2/vhost.template similarity index 100% rename from systemvm/patches/debian/config/etc/apache2/vhost.template rename to systemvm/patches/debian/etc/apache2/vhost.template diff --git a/systemvm/patches/debian/config/etc/cloud-nic.rules b/systemvm/patches/debian/etc/cloud-nic.rules similarity index 100% rename from systemvm/patches/debian/config/etc/cloud-nic.rules rename to systemvm/patches/debian/etc/cloud-nic.rules diff --git a/systemvm/patches/debian/config/etc/dnsmasq.conf.tmpl b/systemvm/patches/debian/etc/dnsmasq.conf.tmpl similarity index 100% rename from systemvm/patches/debian/config/etc/dnsmasq.conf.tmpl rename to systemvm/patches/debian/etc/dnsmasq.conf.tmpl diff --git a/systemvm/patches/debian/config/etc/haproxy/haproxy.cfg b/systemvm/patches/debian/etc/haproxy/haproxy.cfg similarity index 100% rename from systemvm/patches/debian/config/etc/haproxy/haproxy.cfg rename to systemvm/patches/debian/etc/haproxy/haproxy.cfg diff --git a/systemvm/patches/debian/config/etc/init.d/cloud-early-config b/systemvm/patches/debian/etc/init.d/cloud-early-config similarity index 100% rename from systemvm/patches/debian/config/etc/init.d/cloud-early-config rename to systemvm/patches/debian/etc/init.d/cloud-early-config diff --git a/systemvm/patches/debian/config/etc/init.d/cloud-passwd-srvr b/systemvm/patches/debian/etc/init.d/cloud-passwd-srvr similarity index 100% rename from systemvm/patches/debian/config/etc/init.d/cloud-passwd-srvr rename to systemvm/patches/debian/etc/init.d/cloud-passwd-srvr diff --git a/systemvm/patches/debian/config/etc/iptables/iptables-consoleproxy b/systemvm/patches/debian/etc/iptables/iptables-consoleproxy similarity index 100% rename from systemvm/patches/debian/config/etc/iptables/iptables-consoleproxy rename to systemvm/patches/debian/etc/iptables/iptables-consoleproxy diff --git a/systemvm/patches/debian/config/etc/iptables/iptables-dhcpsrvr b/systemvm/patches/debian/etc/iptables/iptables-dhcpsrvr similarity index 100% rename from systemvm/patches/debian/config/etc/iptables/iptables-dhcpsrvr rename to systemvm/patches/debian/etc/iptables/iptables-dhcpsrvr diff --git a/systemvm/patches/debian/config/etc/iptables/iptables-elbvm b/systemvm/patches/debian/etc/iptables/iptables-elbvm similarity index 100% rename from systemvm/patches/debian/config/etc/iptables/iptables-elbvm rename to systemvm/patches/debian/etc/iptables/iptables-elbvm diff --git a/systemvm/patches/debian/config/etc/iptables/iptables-ilbvm b/systemvm/patches/debian/etc/iptables/iptables-ilbvm similarity index 100% rename from systemvm/patches/debian/config/etc/iptables/iptables-ilbvm rename to systemvm/patches/debian/etc/iptables/iptables-ilbvm diff --git a/systemvm/patches/debian/config/etc/iptables/iptables-router b/systemvm/patches/debian/etc/iptables/iptables-router similarity index 100% rename from systemvm/patches/debian/config/etc/iptables/iptables-router rename to systemvm/patches/debian/etc/iptables/iptables-router diff --git a/systemvm/patches/debian/config/etc/iptables/iptables-secstorage b/systemvm/patches/debian/etc/iptables/iptables-secstorage similarity index 100% rename from systemvm/patches/debian/config/etc/iptables/iptables-secstorage rename to systemvm/patches/debian/etc/iptables/iptables-secstorage diff --git a/systemvm/patches/debian/config/etc/iptables/iptables-vpcrouter b/systemvm/patches/debian/etc/iptables/iptables-vpcrouter similarity index 100% rename from systemvm/patches/debian/config/etc/iptables/iptables-vpcrouter rename to systemvm/patches/debian/etc/iptables/iptables-vpcrouter diff --git a/systemvm/patches/debian/config/etc/iptables/rt_tables_init b/systemvm/patches/debian/etc/iptables/rt_tables_init similarity index 100% rename from systemvm/patches/debian/config/etc/iptables/rt_tables_init rename to systemvm/patches/debian/etc/iptables/rt_tables_init diff --git a/systemvm/patches/debian/config/etc/iptables/rules b/systemvm/patches/debian/etc/iptables/rules similarity index 100% rename from systemvm/patches/debian/config/etc/iptables/rules rename to systemvm/patches/debian/etc/iptables/rules diff --git a/systemvm/patches/debian/config/etc/logrotate.conf b/systemvm/patches/debian/etc/logrotate.conf similarity index 100% rename from systemvm/patches/debian/config/etc/logrotate.conf rename to systemvm/patches/debian/etc/logrotate.conf diff --git a/systemvm/patches/debian/config/etc/logrotate.d/apache2 b/systemvm/patches/debian/etc/logrotate.d/apache2 similarity index 100% rename from systemvm/patches/debian/config/etc/logrotate.d/apache2 rename to systemvm/patches/debian/etc/logrotate.d/apache2 diff --git a/systemvm/patches/debian/config/etc/logrotate.d/cloud b/systemvm/patches/debian/etc/logrotate.d/cloud similarity index 100% rename from systemvm/patches/debian/config/etc/logrotate.d/cloud rename to systemvm/patches/debian/etc/logrotate.d/cloud diff --git a/systemvm/patches/debian/config/etc/logrotate.d/conntrackd b/systemvm/patches/debian/etc/logrotate.d/conntrackd similarity index 100% rename from systemvm/patches/debian/config/etc/logrotate.d/conntrackd rename to systemvm/patches/debian/etc/logrotate.d/conntrackd diff --git a/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq b/systemvm/patches/debian/etc/logrotate.d/dnsmasq similarity index 100% rename from systemvm/patches/debian/config/etc/logrotate.d/dnsmasq rename to systemvm/patches/debian/etc/logrotate.d/dnsmasq diff --git a/systemvm/patches/debian/config/etc/logrotate.d/haproxy b/systemvm/patches/debian/etc/logrotate.d/haproxy similarity index 100% rename from systemvm/patches/debian/config/etc/logrotate.d/haproxy rename to systemvm/patches/debian/etc/logrotate.d/haproxy diff --git a/systemvm/patches/debian/config/etc/logrotate.d/ppp b/systemvm/patches/debian/etc/logrotate.d/ppp similarity index 100% rename from systemvm/patches/debian/config/etc/logrotate.d/ppp rename to systemvm/patches/debian/etc/logrotate.d/ppp diff --git a/systemvm/patches/debian/config/etc/logrotate.d/rsyslog b/systemvm/patches/debian/etc/logrotate.d/rsyslog similarity index 100% rename from systemvm/patches/debian/config/etc/logrotate.d/rsyslog rename to systemvm/patches/debian/etc/logrotate.d/rsyslog diff --git a/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf b/systemvm/patches/debian/etc/modprobe.d/aesni_intel.conf similarity index 100% rename from systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf rename to systemvm/patches/debian/etc/modprobe.d/aesni_intel.conf diff --git a/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf b/systemvm/patches/debian/etc/modprobe.d/pcspkr.conf similarity index 100% rename from systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf rename to systemvm/patches/debian/etc/modprobe.d/pcspkr.conf diff --git a/systemvm/patches/debian/config/etc/profile.d/cloud.sh b/systemvm/patches/debian/etc/profile.d/cloud.sh similarity index 100% rename from systemvm/patches/debian/config/etc/profile.d/cloud.sh rename to systemvm/patches/debian/etc/profile.d/cloud.sh diff --git a/systemvm/patches/debian/config/etc/rc.local b/systemvm/patches/debian/etc/rc.local similarity index 100% rename from systemvm/patches/debian/config/etc/rc.local rename to systemvm/patches/debian/etc/rc.local diff --git a/systemvm/patches/debian/config/etc/rsyslog.conf b/systemvm/patches/debian/etc/rsyslog.conf similarity index 100% rename from systemvm/patches/debian/config/etc/rsyslog.conf rename to systemvm/patches/debian/etc/rsyslog.conf diff --git a/systemvm/patches/debian/config/etc/ssh/sshd_config b/systemvm/patches/debian/etc/ssh/sshd_config similarity index 97% rename from systemvm/patches/debian/config/etc/ssh/sshd_config rename to systemvm/patches/debian/etc/ssh/sshd_config index 75f30cc..07f9810 100644 --- a/systemvm/patches/debian/config/etc/ssh/sshd_config +++ b/systemvm/patches/debian/etc/ssh/sshd_config @@ -43,8 +43,8 @@ PermitRootLogin yes #MaxAuthTries 6 #RSAAuthentication yes -#PubkeyAuthentication yes -#AuthorizedKeysFile .ssh/authorized_keys +PubkeyAuthentication yes +AuthorizedKeysFile .ssh/authorized_keys # For this to work you will also need host keys in /etc/ssh/ssh_known_hosts #RhostsRSAAuthentication no @@ -101,7 +101,7 @@ AcceptEnv LC_IDENTIFICATION LC_ALL #X11UseLocalhost yes #PrintMotd yes #PrintLastLog yes -#TCPKeepAlive yes +TCPKeepAlive yes #UseLogin no #UsePrivilegeSeparation yes #PermitUserEnvironment no diff --git a/systemvm/patches/debian/config/etc/sysctl.conf b/systemvm/patches/debian/etc/sysctl.conf similarity index 100% rename from systemvm/patches/debian/config/etc/sysctl.conf rename to systemvm/patches/debian/etc/sysctl.conf diff --git a/systemvm/patches/debian/config/etc/vpcdnsmasq.conf b/systemvm/patches/debian/etc/vpcdnsmasq.conf similarity index 100% rename from systemvm/patches/debian/config/etc/vpcdnsmasq.conf rename to systemvm/patches/debian/etc/vpcdnsmasq.conf diff --git a/systemvm/patches/debian/config/opt/cloud/bin/baremetal-vr.py b/systemvm/patches/debian/opt/cloud/bin/baremetal-vr.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/baremetal-vr.py rename to systemvm/patches/debian/opt/cloud/bin/baremetal-vr.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/baremetal_snat.sh b/systemvm/patches/debian/opt/cloud/bin/baremetal_snat.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/baremetal_snat.sh rename to systemvm/patches/debian/opt/cloud/bin/baremetal_snat.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/bumpup_priority.sh b/systemvm/patches/debian/opt/cloud/bin/bumpup_priority.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/bumpup_priority.sh rename to systemvm/patches/debian/opt/cloud/bin/bumpup_priority.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/checkbatchs2svpn.sh b/systemvm/patches/debian/opt/cloud/bin/checkbatchs2svpn.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/checkbatchs2svpn.sh rename to systemvm/patches/debian/opt/cloud/bin/checkbatchs2svpn.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh b/systemvm/patches/debian/opt/cloud/bin/checkrouter.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh rename to systemvm/patches/debian/opt/cloud/bin/checkrouter.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/checks2svpn.sh b/systemvm/patches/debian/opt/cloud/bin/checks2svpn.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/checks2svpn.sh rename to systemvm/patches/debian/opt/cloud/bin/checks2svpn.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cloud-nic.sh b/systemvm/patches/debian/opt/cloud/bin/cloud-nic.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cloud-nic.sh rename to systemvm/patches/debian/opt/cloud/bin/cloud-nic.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/configure.py b/systemvm/patches/debian/opt/cloud/bin/configure.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/configure.py rename to systemvm/patches/debian/opt/cloud/bin/configure.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsAddress.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py rename to systemvm/patches/debian/opt/cloud/bin/cs/CsAddress.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsApp.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsApp.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsApp.py rename to systemvm/patches/debian/opt/cloud/bin/cs/CsApp.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsConfig.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsConfig.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsConfig.py rename to systemvm/patches/debian/opt/cloud/bin/cs/CsConfig.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsDatabag.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsDatabag.py rename to systemvm/patches/debian/opt/cloud/bin/cs/CsDatabag.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsDhcp.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsDhcp.py rename to systemvm/patches/debian/opt/cloud/bin/cs/CsDhcp.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsFile.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsFile.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsFile.py rename to systemvm/patches/debian/opt/cloud/bin/cs/CsFile.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsGuestNetwork.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsGuestNetwork.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsGuestNetwork.py rename to systemvm/patches/debian/opt/cloud/bin/cs/CsGuestNetwork.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsHelper.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsHelper.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsHelper.py rename to systemvm/patches/debian/opt/cloud/bin/cs/CsHelper.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsLoadBalancer.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsLoadBalancer.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsLoadBalancer.py rename to systemvm/patches/debian/opt/cloud/bin/cs/CsLoadBalancer.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsMonitor.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsMonitor.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsMonitor.py rename to systemvm/patches/debian/opt/cloud/bin/cs/CsMonitor.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsNetfilter.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsNetfilter.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsNetfilter.py rename to systemvm/patches/debian/opt/cloud/bin/cs/CsNetfilter.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsProcess.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsProcess.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsProcess.py rename to systemvm/patches/debian/opt/cloud/bin/cs/CsProcess.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsRedundant.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py rename to systemvm/patches/debian/opt/cloud/bin/cs/CsRedundant.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRoute.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsRoute.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsRoute.py rename to systemvm/patches/debian/opt/cloud/bin/cs/CsRoute.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRule.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsRule.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsRule.py rename to systemvm/patches/debian/opt/cloud/bin/cs/CsRule.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsStaticRoutes.py b/systemvm/patches/debian/opt/cloud/bin/cs/CsStaticRoutes.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs/CsStaticRoutes.py rename to systemvm/patches/debian/opt/cloud/bin/cs/CsStaticRoutes.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/__init__.py b/systemvm/patches/debian/opt/cloud/bin/cs/__init__.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs/__init__.py rename to systemvm/patches/debian/opt/cloud/bin/cs/__init__.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_cmdline.py b/systemvm/patches/debian/opt/cloud/bin/cs_cmdline.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs_cmdline.py rename to systemvm/patches/debian/opt/cloud/bin/cs_cmdline.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_dhcp.py b/systemvm/patches/debian/opt/cloud/bin/cs_dhcp.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs_dhcp.py rename to systemvm/patches/debian/opt/cloud/bin/cs_dhcp.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_firewallrules.py b/systemvm/patches/debian/opt/cloud/bin/cs_firewallrules.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs_firewallrules.py rename to systemvm/patches/debian/opt/cloud/bin/cs_firewallrules.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_forwardingrules.py b/systemvm/patches/debian/opt/cloud/bin/cs_forwardingrules.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs_forwardingrules.py rename to systemvm/patches/debian/opt/cloud/bin/cs_forwardingrules.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_guestnetwork.py b/systemvm/patches/debian/opt/cloud/bin/cs_guestnetwork.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs_guestnetwork.py rename to systemvm/patches/debian/opt/cloud/bin/cs_guestnetwork.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_ip.py b/systemvm/patches/debian/opt/cloud/bin/cs_ip.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs_ip.py rename to systemvm/patches/debian/opt/cloud/bin/cs_ip.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_loadbalancer.py b/systemvm/patches/debian/opt/cloud/bin/cs_loadbalancer.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs_loadbalancer.py rename to systemvm/patches/debian/opt/cloud/bin/cs_loadbalancer.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_monitorservice.py b/systemvm/patches/debian/opt/cloud/bin/cs_monitorservice.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs_monitorservice.py rename to systemvm/patches/debian/opt/cloud/bin/cs_monitorservice.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_network_acl.py b/systemvm/patches/debian/opt/cloud/bin/cs_network_acl.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs_network_acl.py rename to systemvm/patches/debian/opt/cloud/bin/cs_network_acl.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_remoteaccessvpn.py b/systemvm/patches/debian/opt/cloud/bin/cs_remoteaccessvpn.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs_remoteaccessvpn.py rename to systemvm/patches/debian/opt/cloud/bin/cs_remoteaccessvpn.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_site2sitevpn.py b/systemvm/patches/debian/opt/cloud/bin/cs_site2sitevpn.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs_site2sitevpn.py rename to systemvm/patches/debian/opt/cloud/bin/cs_site2sitevpn.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py b/systemvm/patches/debian/opt/cloud/bin/cs_staticroutes.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs_staticroutes.py rename to systemvm/patches/debian/opt/cloud/bin/cs_staticroutes.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_vmdata.py b/systemvm/patches/debian/opt/cloud/bin/cs_vmdata.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs_vmdata.py rename to systemvm/patches/debian/opt/cloud/bin/cs_vmdata.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_vmp.py b/systemvm/patches/debian/opt/cloud/bin/cs_vmp.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs_vmp.py rename to systemvm/patches/debian/opt/cloud/bin/cs_vmp.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs_vpnusers.py b/systemvm/patches/debian/opt/cloud/bin/cs_vpnusers.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/cs_vpnusers.py rename to systemvm/patches/debian/opt/cloud/bin/cs_vpnusers.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/dnsmasq.sh b/systemvm/patches/debian/opt/cloud/bin/dnsmasq.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/dnsmasq.sh rename to systemvm/patches/debian/opt/cloud/bin/dnsmasq.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh b/systemvm/patches/debian/opt/cloud/bin/edithosts.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/edithosts.sh rename to systemvm/patches/debian/opt/cloud/bin/edithosts.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/getRouterAlerts.sh b/systemvm/patches/debian/opt/cloud/bin/getRouterAlerts.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/getRouterAlerts.sh rename to systemvm/patches/debian/opt/cloud/bin/getRouterAlerts.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/get_template_version.sh b/systemvm/patches/debian/opt/cloud/bin/get_template_version.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/get_template_version.sh rename to systemvm/patches/debian/opt/cloud/bin/get_template_version.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/ilb.sh b/systemvm/patches/debian/opt/cloud/bin/ilb.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/ilb.sh rename to systemvm/patches/debian/opt/cloud/bin/ilb.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/ipassoc.sh b/systemvm/patches/debian/opt/cloud/bin/ipassoc.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/ipassoc.sh rename to systemvm/patches/debian/opt/cloud/bin/ipassoc.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/ipsectunnel.sh b/systemvm/patches/debian/opt/cloud/bin/ipsectunnel.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/ipsectunnel.sh rename to systemvm/patches/debian/opt/cloud/bin/ipsectunnel.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/line_edit.py b/systemvm/patches/debian/opt/cloud/bin/line_edit.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/line_edit.py rename to systemvm/patches/debian/opt/cloud/bin/line_edit.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/loadbalancer.sh b/systemvm/patches/debian/opt/cloud/bin/loadbalancer.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/loadbalancer.sh rename to systemvm/patches/debian/opt/cloud/bin/loadbalancer.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/master.py b/systemvm/patches/debian/opt/cloud/bin/master.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/master.py rename to systemvm/patches/debian/opt/cloud/bin/master.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/merge.py b/systemvm/patches/debian/opt/cloud/bin/merge.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/merge.py rename to systemvm/patches/debian/opt/cloud/bin/merge.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/monitor_service.sh b/systemvm/patches/debian/opt/cloud/bin/monitor_service.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/monitor_service.sh rename to systemvm/patches/debian/opt/cloud/bin/monitor_service.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/netusage.sh b/systemvm/patches/debian/opt/cloud/bin/netusage.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/netusage.sh rename to systemvm/patches/debian/opt/cloud/bin/netusage.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/passwd_server b/systemvm/patches/debian/opt/cloud/bin/passwd_server similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/passwd_server rename to systemvm/patches/debian/opt/cloud/bin/passwd_server diff --git a/systemvm/patches/debian/config/opt/cloud/bin/passwd_server_ip b/systemvm/patches/debian/opt/cloud/bin/passwd_server_ip similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/passwd_server_ip rename to systemvm/patches/debian/opt/cloud/bin/passwd_server_ip diff --git a/systemvm/patches/debian/config/opt/cloud/bin/passwd_server_ip.py b/systemvm/patches/debian/opt/cloud/bin/passwd_server_ip.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/passwd_server_ip.py rename to systemvm/patches/debian/opt/cloud/bin/passwd_server_ip.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/prepare_pxe.sh b/systemvm/patches/debian/opt/cloud/bin/prepare_pxe.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/prepare_pxe.sh rename to systemvm/patches/debian/opt/cloud/bin/prepare_pxe.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/savepassword.sh b/systemvm/patches/debian/opt/cloud/bin/savepassword.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/savepassword.sh rename to systemvm/patches/debian/opt/cloud/bin/savepassword.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/set_redundant.py b/systemvm/patches/debian/opt/cloud/bin/set_redundant.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/set_redundant.py rename to systemvm/patches/debian/opt/cloud/bin/set_redundant.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/setup/common.sh b/systemvm/patches/debian/opt/cloud/bin/setup/common.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/setup/common.sh rename to systemvm/patches/debian/opt/cloud/bin/setup/common.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/setup/consoleproxy.sh b/systemvm/patches/debian/opt/cloud/bin/setup/consoleproxy.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/setup/consoleproxy.sh rename to systemvm/patches/debian/opt/cloud/bin/setup/consoleproxy.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/setup/default.sh b/systemvm/patches/debian/opt/cloud/bin/setup/default.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/setup/default.sh rename to systemvm/patches/debian/opt/cloud/bin/setup/default.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/setup/dhcpsrvr.sh b/systemvm/patches/debian/opt/cloud/bin/setup/dhcpsrvr.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/setup/dhcpsrvr.sh rename to systemvm/patches/debian/opt/cloud/bin/setup/dhcpsrvr.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/setup/elbvm.sh b/systemvm/patches/debian/opt/cloud/bin/setup/elbvm.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/setup/elbvm.sh rename to systemvm/patches/debian/opt/cloud/bin/setup/elbvm.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/setup/ilbvm.sh b/systemvm/patches/debian/opt/cloud/bin/setup/ilbvm.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/setup/ilbvm.sh rename to systemvm/patches/debian/opt/cloud/bin/setup/ilbvm.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/setup/patchsystemvm.sh b/systemvm/patches/debian/opt/cloud/bin/setup/patchsystemvm.sh similarity index 95% rename from systemvm/patches/debian/config/opt/cloud/bin/setup/patchsystemvm.sh rename to systemvm/patches/debian/opt/cloud/bin/setup/patchsystemvm.sh index 43c3c92..d09cc03 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/setup/patchsystemvm.sh +++ b/systemvm/patches/debian/opt/cloud/bin/setup/patchsystemvm.sh @@ -46,9 +46,9 @@ TYPE=$2 echo "Patching systemvm for cloud service with mount=$PATCH_MOUNT for type=$TYPE" >> $logfile -if [ "$TYPE" == "consoleproxy" ] || [ "$TYPE" == "secstorage" ] && [ -f ${PATCH_MOUNT}/systemvm.zip ] +if [ "$TYPE" == "consoleproxy" ] || [ "$TYPE" == "secstorage" ] && [ -f ${PATCH_MOUNT}/agent.zip ] then - patch_systemvm ${PATCH_MOUNT}/systemvm.zip + patch_systemvm ${PATCH_MOUNT}/agent.zip if [ $? -gt 0 ] then echo "Failed to apply patch systemvm\n" >> $logfile diff --git a/systemvm/patches/debian/config/opt/cloud/bin/setup/router.sh b/systemvm/patches/debian/opt/cloud/bin/setup/router.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/setup/router.sh rename to systemvm/patches/debian/opt/cloud/bin/setup/router.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/setup/secstorage.sh b/systemvm/patches/debian/opt/cloud/bin/setup/secstorage.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/setup/secstorage.sh rename to systemvm/patches/debian/opt/cloud/bin/setup/secstorage.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/setup/vpcrouter.sh b/systemvm/patches/debian/opt/cloud/bin/setup/vpcrouter.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/setup/vpcrouter.sh rename to systemvm/patches/debian/opt/cloud/bin/setup/vpcrouter.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/update_config.py b/systemvm/patches/debian/opt/cloud/bin/update_config.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/update_config.py rename to systemvm/patches/debian/opt/cloud/bin/update_config.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/vmdata.py b/systemvm/patches/debian/opt/cloud/bin/vmdata.py similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/vmdata.py rename to systemvm/patches/debian/opt/cloud/bin/vmdata.py diff --git a/systemvm/patches/debian/config/opt/cloud/bin/vpc_func.sh b/systemvm/patches/debian/opt/cloud/bin/vpc_func.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/vpc_func.sh rename to systemvm/patches/debian/opt/cloud/bin/vpc_func.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/vpc_netusage.sh b/systemvm/patches/debian/opt/cloud/bin/vpc_netusage.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/vpc_netusage.sh rename to systemvm/patches/debian/opt/cloud/bin/vpc_netusage.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/vpc_passwd_server b/systemvm/patches/debian/opt/cloud/bin/vpc_passwd_server similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/vpc_passwd_server rename to systemvm/patches/debian/opt/cloud/bin/vpc_passwd_server diff --git a/systemvm/patches/debian/config/opt/cloud/bin/vpc_snat.sh b/systemvm/patches/debian/opt/cloud/bin/vpc_snat.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/vpc_snat.sh rename to systemvm/patches/debian/opt/cloud/bin/vpc_snat.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/vpc_staticroute.sh b/systemvm/patches/debian/opt/cloud/bin/vpc_staticroute.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/vpc_staticroute.sh rename to systemvm/patches/debian/opt/cloud/bin/vpc_staticroute.sh diff --git a/systemvm/patches/debian/config/opt/cloud/bin/vr_cfg.sh b/systemvm/patches/debian/opt/cloud/bin/vr_cfg.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/vr_cfg.sh rename to systemvm/patches/debian/opt/cloud/bin/vr_cfg.sh diff --git a/systemvm/patches/debian/config/opt/cloud/templates/README b/systemvm/patches/debian/opt/cloud/templates/README similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/templates/README rename to systemvm/patches/debian/opt/cloud/templates/README diff --git a/systemvm/patches/debian/config/opt/cloud/templates/arping_gateways.sh.templ b/systemvm/patches/debian/opt/cloud/templates/arping_gateways.sh.templ similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/templates/arping_gateways.sh.templ rename to systemvm/patches/debian/opt/cloud/templates/arping_gateways.sh.templ diff --git a/systemvm/patches/debian/config/opt/cloud/templates/check_bumpup.sh b/systemvm/patches/debian/opt/cloud/templates/check_bumpup.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/templates/check_bumpup.sh rename to systemvm/patches/debian/opt/cloud/templates/check_bumpup.sh diff --git a/systemvm/patches/debian/config/opt/cloud/templates/check_heartbeat.sh.templ b/systemvm/patches/debian/opt/cloud/templates/check_heartbeat.sh.templ similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/templates/check_heartbeat.sh.templ rename to systemvm/patches/debian/opt/cloud/templates/check_heartbeat.sh.templ diff --git a/systemvm/patches/debian/config/opt/cloud/templates/checkrouter.sh.templ b/systemvm/patches/debian/opt/cloud/templates/checkrouter.sh.templ similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/templates/checkrouter.sh.templ rename to systemvm/patches/debian/opt/cloud/templates/checkrouter.sh.templ diff --git a/systemvm/patches/debian/config/opt/cloud/templates/conntrackd.conf.templ b/systemvm/patches/debian/opt/cloud/templates/conntrackd.conf.templ similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/templates/conntrackd.conf.templ rename to systemvm/patches/debian/opt/cloud/templates/conntrackd.conf.templ diff --git a/systemvm/patches/debian/config/opt/cloud/templates/heartbeat.sh.templ b/systemvm/patches/debian/opt/cloud/templates/heartbeat.sh.templ similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/templates/heartbeat.sh.templ rename to systemvm/patches/debian/opt/cloud/templates/heartbeat.sh.templ diff --git a/systemvm/patches/debian/config/opt/cloud/templates/keepalived.conf.templ b/systemvm/patches/debian/opt/cloud/templates/keepalived.conf.templ similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/templates/keepalived.conf.templ rename to systemvm/patches/debian/opt/cloud/templates/keepalived.conf.templ diff --git a/systemvm/patches/debian/config/opt/cloud/testdata/README b/systemvm/patches/debian/opt/cloud/testdata/README similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/testdata/README rename to systemvm/patches/debian/opt/cloud/testdata/README diff --git a/systemvm/patches/debian/config/opt/cloud/testdata/acl0001.json b/systemvm/patches/debian/opt/cloud/testdata/acl0001.json similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/testdata/acl0001.json rename to systemvm/patches/debian/opt/cloud/testdata/acl0001.json diff --git a/systemvm/patches/debian/config/opt/cloud/testdata/dhcp0001.json b/systemvm/patches/debian/opt/cloud/testdata/dhcp0001.json similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/testdata/dhcp0001.json rename to systemvm/patches/debian/opt/cloud/testdata/dhcp0001.json diff --git a/systemvm/patches/debian/config/opt/cloud/testdata/gn0001.json b/systemvm/patches/debian/opt/cloud/testdata/gn0001.json similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/testdata/gn0001.json rename to systemvm/patches/debian/opt/cloud/testdata/gn0001.json diff --git a/systemvm/patches/debian/config/opt/cloud/testdata/ips0001.json b/systemvm/patches/debian/opt/cloud/testdata/ips0001.json similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/testdata/ips0001.json rename to systemvm/patches/debian/opt/cloud/testdata/ips0001.json diff --git a/systemvm/patches/debian/config/opt/cloud/testdata/ips0002.json b/systemvm/patches/debian/opt/cloud/testdata/ips0002.json similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/testdata/ips0002.json rename to systemvm/patches/debian/opt/cloud/testdata/ips0002.json diff --git a/systemvm/patches/debian/config/opt/cloud/testdata/ips0003.json b/systemvm/patches/debian/opt/cloud/testdata/ips0003.json similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/testdata/ips0003.json rename to systemvm/patches/debian/opt/cloud/testdata/ips0003.json diff --git a/systemvm/patches/debian/config/opt/cloud/testdata/s2s0001.json b/systemvm/patches/debian/opt/cloud/testdata/s2s0001.json similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/testdata/s2s0001.json rename to systemvm/patches/debian/opt/cloud/testdata/s2s0001.json diff --git a/systemvm/patches/debian/config/opt/cloud/bin/test.sh b/systemvm/patches/debian/opt/cloud/testdata/test.sh similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/bin/test.sh rename to systemvm/patches/debian/opt/cloud/testdata/test.sh diff --git a/systemvm/patches/debian/config/opt/cloud/testdata/vmp0001.json b/systemvm/patches/debian/opt/cloud/testdata/vmp0001.json similarity index 100% rename from systemvm/patches/debian/config/opt/cloud/testdata/vmp0001.json rename to systemvm/patches/debian/opt/cloud/testdata/vmp0001.json diff --git a/systemvm/patches/debian/config/root/.ssh/authorized_keys b/systemvm/patches/debian/root/.ssh/authorized_keys similarity index 100% rename from systemvm/patches/debian/config/root/.ssh/authorized_keys rename to systemvm/patches/debian/root/.ssh/authorized_keys diff --git a/systemvm/patches/debian/config/root/clearUsageRules.sh b/systemvm/patches/debian/root/clearUsageRules.sh similarity index 100% rename from systemvm/patches/debian/config/root/clearUsageRules.sh rename to systemvm/patches/debian/root/clearUsageRules.sh diff --git a/systemvm/patches/debian/config/root/func.sh b/systemvm/patches/debian/root/func.sh similarity index 100% rename from systemvm/patches/debian/config/root/func.sh rename to systemvm/patches/debian/root/func.sh diff --git a/systemvm/patches/debian/config/root/monitorServices.py b/systemvm/patches/debian/root/monitorServices.py similarity index 100% rename from systemvm/patches/debian/config/root/monitorServices.py rename to systemvm/patches/debian/root/monitorServices.py diff --git a/systemvm/patches/debian/config/root/reconfigLB.sh b/systemvm/patches/debian/root/reconfigLB.sh similarity index 100% rename from systemvm/patches/debian/config/root/reconfigLB.sh rename to systemvm/patches/debian/root/reconfigLB.sh diff --git a/systemvm/patches/debian/config/var/www/html/latest/.htaccess b/systemvm/patches/debian/var/www/html/latest/.htaccess similarity index 100% rename from systemvm/patches/debian/config/var/www/html/latest/.htaccess rename to systemvm/patches/debian/var/www/html/latest/.htaccess diff --git a/systemvm/patches/debian/config/var/www/html/userdata/.htaccess b/systemvm/patches/debian/var/www/html/userdata/.htaccess similarity index 100% rename from systemvm/patches/debian/config/var/www/html/userdata/.htaccess rename to systemvm/patches/debian/var/www/html/userdata/.htaccess diff --git a/systemvm/test/python/TestCsAddress.py b/systemvm/patches/test/TestCsAddress.py similarity index 100% rename from systemvm/test/python/TestCsAddress.py rename to systemvm/patches/test/TestCsAddress.py diff --git a/systemvm/test/python/TestCsApp.py b/systemvm/patches/test/TestCsApp.py similarity index 100% rename from systemvm/test/python/TestCsApp.py rename to systemvm/patches/test/TestCsApp.py diff --git a/systemvm/test/python/TestCsCmdLine.py b/systemvm/patches/test/TestCsCmdLine.py similarity index 100% rename from systemvm/test/python/TestCsCmdLine.py rename to systemvm/patches/test/TestCsCmdLine.py diff --git a/systemvm/test/python/TestCsConfig.py b/systemvm/patches/test/TestCsConfig.py similarity index 100% rename from systemvm/test/python/TestCsConfig.py rename to systemvm/patches/test/TestCsConfig.py diff --git a/systemvm/test/python/TestCsDatabag.py b/systemvm/patches/test/TestCsDatabag.py similarity index 100% rename from systemvm/test/python/TestCsDatabag.py rename to systemvm/patches/test/TestCsDatabag.py diff --git a/systemvm/test/python/TestCsDhcp.py b/systemvm/patches/test/TestCsDhcp.py similarity index 100% rename from systemvm/test/python/TestCsDhcp.py rename to systemvm/patches/test/TestCsDhcp.py diff --git a/systemvm/test/python/TestCsFile.py b/systemvm/patches/test/TestCsFile.py similarity index 100% rename from systemvm/test/python/TestCsFile.py rename to systemvm/patches/test/TestCsFile.py diff --git a/systemvm/test/python/TestCsGuestNetwork.py b/systemvm/patches/test/TestCsGuestNetwork.py similarity index 100% rename from systemvm/test/python/TestCsGuestNetwork.py rename to systemvm/patches/test/TestCsGuestNetwork.py diff --git a/systemvm/test/python/TestCsHelper.py b/systemvm/patches/test/TestCsHelper.py similarity index 100% rename from systemvm/test/python/TestCsHelper.py rename to systemvm/patches/test/TestCsHelper.py diff --git a/systemvm/test/python/TestCsInterface.py b/systemvm/patches/test/TestCsInterface.py similarity index 100% rename from systemvm/test/python/TestCsInterface.py rename to systemvm/patches/test/TestCsInterface.py diff --git a/systemvm/test/python/TestCsNetfilter.py b/systemvm/patches/test/TestCsNetfilter.py similarity index 100% rename from systemvm/test/python/TestCsNetfilter.py rename to systemvm/patches/test/TestCsNetfilter.py diff --git a/systemvm/test/python/TestCsProcess.py b/systemvm/patches/test/TestCsProcess.py similarity index 100% rename from systemvm/test/python/TestCsProcess.py rename to systemvm/patches/test/TestCsProcess.py diff --git a/systemvm/test/python/TestCsRedundant.py b/systemvm/patches/test/TestCsRedundant.py similarity index 100% rename from systemvm/test/python/TestCsRedundant.py rename to systemvm/patches/test/TestCsRedundant.py diff --git a/systemvm/test/python/TestCsRoute.py b/systemvm/patches/test/TestCsRoute.py similarity index 100% rename from systemvm/test/python/TestCsRoute.py rename to systemvm/patches/test/TestCsRoute.py diff --git a/systemvm/test/python/TestCsRule.py b/systemvm/patches/test/TestCsRule.py similarity index 100% rename from systemvm/test/python/TestCsRule.py rename to systemvm/patches/test/TestCsRule.py diff --git a/systemvm/test/python/runtests.sh b/systemvm/patches/test/runtests.sh similarity index 94% rename from systemvm/test/python/runtests.sh rename to systemvm/patches/test/runtests.sh index 6d6a196..e64f867 100644 --- a/systemvm/test/python/runtests.sh +++ b/systemvm/patches/test/runtests.sh @@ -18,7 +18,7 @@ # requires netaddr -export PYTHONPATH="../../patches/debian/config/opt/cloud/bin/" +export PYTHONPATH="../debian/opt/cloud/bin/" export PYTHONDONTWRITEBYTECODE=False pep8 --max-line-length=179 --exclude=monitorServices.py,baremetal-vr.py,passwd_server_ip.py `find ../../patches -name \*.py` diff --git a/systemvm/patches/debian/vpn/etc/ipsec.conf b/systemvm/patches/vpn/etc/ipsec.conf similarity index 100% rename from systemvm/patches/debian/vpn/etc/ipsec.conf rename to systemvm/patches/vpn/etc/ipsec.conf diff --git a/systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf b/systemvm/patches/vpn/etc/ipsec.d/l2tp.conf similarity index 100% rename from systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf rename to systemvm/patches/vpn/etc/ipsec.d/l2tp.conf diff --git a/systemvm/patches/debian/vpn/etc/ipsec.secrets b/systemvm/patches/vpn/etc/ipsec.secrets similarity index 100% rename from systemvm/patches/debian/vpn/etc/ipsec.secrets rename to systemvm/patches/vpn/etc/ipsec.secrets diff --git a/systemvm/patches/debian/vpn/etc/ppp/options.xl2tpd b/systemvm/patches/vpn/etc/ppp/options.xl2tpd similarity index 100% rename from systemvm/patches/debian/vpn/etc/ppp/options.xl2tpd rename to systemvm/patches/vpn/etc/ppp/options.xl2tpd diff --git a/systemvm/patches/debian/vpn/etc/xl2tpd/xl2tpd.conf b/systemvm/patches/vpn/etc/xl2tpd/xl2tpd.conf similarity index 100% rename from systemvm/patches/debian/vpn/etc/xl2tpd/xl2tpd.conf rename to systemvm/patches/vpn/etc/xl2tpd/xl2tpd.conf diff --git a/systemvm/patches/debian/vpn/opt/cloud/bin/vpn_l2tp.sh b/systemvm/patches/vpn/opt/cloud/bin/vpn_l2tp.sh similarity index 100% rename from systemvm/patches/debian/vpn/opt/cloud/bin/vpn_l2tp.sh rename to systemvm/patches/vpn/opt/cloud/bin/vpn_l2tp.sh diff --git a/systemvm/pom.xml b/systemvm/pom.xml index f617495..0ae3e02 100644 --- a/systemvm/pom.xml +++ b/systemvm/pom.xml @@ -52,10 +52,10 @@ maven-assembly-plugin - systemvm + agent false - systemvm-descriptor.xml + systemvm-agent-descriptor.xml @@ -84,11 +84,11 @@ target - systemvm.zip + agent.zip - patches/debian/config/root/.ssh + patches/debian/root/.ssh authorized_keys @@ -111,12 +111,11 @@ - - + - + @@ -169,7 +168,7 @@ -r -o systemvm.iso - systemvm.zip + agent.zip cloud-scripts.tgz authorized_keys diff --git a/systemvm/scripts/run.bat b/systemvm/scripts/run.bat deleted file mode 100644 index ce6dc40..0000000 --- a/systemvm/scripts/run.bat +++ /dev/null @@ -1,18 +0,0 @@ -rem Licensed to the Apache Software Foundation (ASF) under one -rem or more contributor license agreements. See the NOTICE file -rem distributed with this work for additional information -rem regarding copyright ownership. The ASF licenses this file -rem to you under the Apache License, Version 2.0 (the -rem "License"); you may not use this file except in compliance -rem with the License. You may obtain a copy of the License at -rem -rem http://www.apache.org/licenses/LICENSE-2.0 -rem -rem Unless required by applicable law or agreed to in writing, -rem software distributed under the License is distributed on an -rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -rem KIND, either express or implied. See the License for the -rem specific language governing permissions and limitations -rem under the License. - -java -mx700m -cp cloud-console-proxy.jar;;cloud-console-common.jar;log4j-1.2.15.jar;apache-log4j-extras-1.0.jar;gson-1.3.jar;commons-logging-1.1.1.jar;.;.\conf; com.cloud.consoleproxy.ConsoleProxy %* diff --git a/systemvm/systemvm-descriptor.xml b/systemvm/systemvm-agent-descriptor.xml similarity index 92% rename from systemvm/systemvm-descriptor.xml rename to systemvm/systemvm-agent-descriptor.xml index ce5ae4b..a3f0453 100644 --- a/systemvm/systemvm-descriptor.xml +++ b/systemvm/systemvm-agent-descriptor.xml @@ -19,7 +19,7 @@ - systemvm + agent zip @@ -46,13 +46,13 @@ 555 - scripts + agent/scripts 555 555 - conf + agent/conf conf 555 555 @@ -63,7 +63,7 @@ - images + agent/images images 555 555 @@ -75,7 +75,7 @@ - js + agent/js js 555 555 @@ -84,7 +84,7 @@ - ui + agent/ui ui 555 555 @@ -93,7 +93,7 @@ - css + agent/css css 555 555 @@ -102,7 +102,7 @@ - certs + agent/certs certs 555 555 -- To stop receiving notification emails like this one, please contact "commits@cloudstack.apache.org" .