From 6c261042821c5597dab8d6be85dc59c948424e13 Mon Sep 17 00:00:00 2001 From: Hugo Trippaers Date: Fri, 20 Sep 2013 18:08:20 +0800 Subject: [PATCH] Move the system vm to a separate maven project. All (almost) files belonging to the systemvm aer now centralize in the systemvm directory. The code for the separate functions is still in the services directory. This will make the code easier to understand and makes it clear that the systemvm is a separate item. It alos means that it can be excluded from the build entirely by not adding the systemvm profile, this will speed up the compiles somewhat. --- client/pom.xml | 5 +- pom.xml | 7 +- services/console-proxy/server/pom.xml | 243 +--------------- .../bindir/cloud-setup-console-proxy.in | 0 .../server => systemvm}/certs/localhost.crt | 0 .../server => systemvm}/certs/localhost.key | 0 .../server => systemvm}/certs/realhostip.crt | 0 .../server => systemvm}/certs/realhostip.csr | 0 .../server => systemvm}/certs/realhostip.key | 0 .../certs/realhostip.keystore | Bin .../cloudpatch-descriptor.xml | 0 .../conf.dom0/agent.properties.in | 0 .../conf.dom0/consoleproxy.properties.in | 0 .../conf.dom0/log4j-cloud.xml.in | 0 .../server => systemvm}/conf/agent.properties | 0 .../conf/consoleproxy.properties | 0 .../conf/environment.properties | 0 .../server => systemvm}/conf/log4j-cloud.xml | 0 .../server => systemvm}/css/ajaxviewer.css | 0 .../server => systemvm}/css/logger.css | 0 .../rc.d/init.d/cloud-console-proxy.in | 0 .../rc.d/init.d/cloud-console-proxy.in | 0 .../rc.d/init.d/cloud-console-proxy.in | 0 .../SYSCONFDIR/init.d/cloud-console-proxy.in | 0 .../server => systemvm}/images/back.gif | Bin .../images/bright-green.png | Bin .../server => systemvm}/images/cad.gif | Bin .../images/cannotconnect.jpg | Bin .../server => systemvm}/images/clr_button.gif | Bin .../images/clr_button_hover.gif | Bin .../server => systemvm}/images/dot.cur | Bin .../server => systemvm}/images/gray-green.png | Bin .../images/grid_headerbg.gif | Bin .../server => systemvm}/images/left.png | Bin .../images/minimize_button.gif | Bin .../images/minimize_button_hover.gif | Bin .../server => systemvm}/images/notready.jpg | Bin .../images/play_button.gif | Bin .../images/play_button_hover.gif | Bin .../server => systemvm}/images/right.png | Bin .../server => systemvm}/images/right2.png | Bin .../images/shrink_button.gif | Bin .../images/shrink_button_hover.gif | Bin .../images/stop_button.gif | Bin .../images/stop_button_hover.gif | Bin .../server => systemvm}/images/winlog.png | Bin .../server => systemvm}/js/ajaxkeys.js | 0 .../server => systemvm}/js/ajaxviewer.js | 0 .../server => systemvm}/js/cloud.logger.js | 0 .../server => systemvm}/js/handler.js | 0 .../server => systemvm}/js/jquery.js | 0 .../libexec/console-proxy-runner.in | 0 .../patches}/debian/README | 0 .../patches}/debian/buildsystemvm.sh | 0 .../patches}/debian/config.dat | 0 .../debian/config/etc/apache2/httpd.conf | 0 .../debian/config/etc/apache2/ports.conf | 0 .../etc/apache2/sites-available/default | 0 .../etc/apache2/sites-available/default-ssl | 0 .../config/etc/apache2/vhostexample.conf | 0 .../debian/config/etc/cloud-nic.rules | 0 .../config/etc/cron.daily/cloud-cleanup | 0 .../patches}/debian/config/etc/default/cloud | 0 .../config/etc/default/cloud-passwd-srvr | 0 .../debian/config/etc/dnsmasq.conf.tmpl | 0 .../debian/config/etc/haproxy/haproxy.cfg | 0 .../patches}/debian/config/etc/init.d/cloud | 0 .../config/etc/init.d/cloud-early-config | 0 .../config/etc/init.d/cloud-passwd-srvr | 0 .../debian/config/etc/init.d/postinit | 0 .../config/etc/iptables/iptables-consoleproxy | 0 .../debian/config/etc/iptables/iptables-elbvm | 0 .../debian/config/etc/iptables/iptables-ilbvm | 0 .../config/etc/iptables/iptables-router | 0 .../config/etc/iptables/iptables-secstorage | 0 .../config/etc/iptables/iptables-vpcrouter | 0 .../debian/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/dnsmasq | 0 .../debian/config/etc/logrotate.d/haproxy | 0 .../debian/config/etc/logrotate.d/ppp | 0 .../debian/config/etc/logrotate.d/rsyslog | 0 .../debian/config/etc/modprobe.d/aesni_intel | 0 .../debian/config/etc/profile.d/cloud.sh | 0 .../patches}/debian/config/etc/rc.local | 0 .../patches}/debian/config/etc/rsyslog.conf | 0 .../debian/config/etc/ssh/sshd_config | 0 .../patches}/debian/config/etc/sysctl.conf | 0 .../debian/config/etc/vpcdnsmasq.conf | 0 .../config/opt/cloud/bin/checkbatchs2svpn.sh | 0 .../config/opt/cloud/bin/checks2svpn.sh | 0 .../debian/config/opt/cloud/bin/cloud-nic.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/netusage.sh | 0 .../debian/config/opt/cloud/bin/passwd_server | 0 .../config/opt/cloud/bin/passwd_server_ip | 0 .../config/opt/cloud/bin/patchsystemvm.sh | 0 .../config/opt/cloud/bin/serve_password.sh | 0 .../debian/config/opt/cloud/bin/vmdata.py | 0 .../debian/config/opt/cloud/bin/vpc_acl.sh | 0 .../debian/config/opt/cloud/bin/vpc_func.sh | 0 .../config/opt/cloud/bin/vpc_guestnw.sh | 0 .../config/opt/cloud/bin/vpc_ipassoc.sh | 0 .../config/opt/cloud/bin/vpc_loadbalancer.sh | 0 .../config/opt/cloud/bin/vpc_netusage.sh | 0 .../config/opt/cloud/bin/vpc_passwd_server | 0 .../opt/cloud/bin/vpc_portforwarding.sh | 0 .../opt/cloud/bin/vpc_privateGateway.sh | 0 .../config/opt/cloud/bin/vpc_privategw_acl.sh | 0 .../debian/config/opt/cloud/bin/vpc_snat.sh | 0 .../config/opt/cloud/bin/vpc_staticnat.sh | 0 .../config/opt/cloud/bin/vpc_staticroute.sh | 0 .../debian/config/root/.ssh/authorized_keys | 0 .../debian/config/root/bumpup_priority.sh | 0 .../debian/config/root/clearUsageRules.sh | 0 .../debian/config/root/createIpAlias.sh | 0 .../debian/config/root/deleteIpAlias.sh | 0 .../patches}/debian/config/root/dnsmasq.sh | 0 .../patches}/debian/config/root/edithosts.sh | 0 .../patches}/debian/config/root/firewall.sh | 0 .../debian/config/root/firewallRule_egress.sh | 0 .../debian/config/root/firewall_rule.sh | 0 .../patches}/debian/config/root/func.sh | 0 .../debian/config/root/loadbalancer.sh | 0 .../patches}/debian/config/root/reconfigLB.sh | 0 .../redundant_router/arping_gateways.sh.templ | 0 .../root/redundant_router/backup.sh.templ | 0 .../root/redundant_router/check_bumpup.sh | 0 .../redundant_router/check_heartbeat.sh.templ | 0 .../redundant_router/checkrouter.sh.templ | 0 .../redundant_router/conntrackd.conf.templ | 0 .../root/redundant_router/disable_pubip.sh | 0 .../redundant_router/enable_pubip.sh.templ | 0 .../root/redundant_router/fault.sh.templ | 0 .../root/redundant_router/heartbeat.sh.templ | 0 .../redundant_router/keepalived.conf.templ | 0 .../root/redundant_router/master.sh.templ | 0 .../redundant_router/primary-backup.sh.templ | 0 .../config/root/redundant_router/services.sh | 0 .../debian/config/root/savepassword.sh | 0 .../patches}/debian/config/root/userdata.py | 0 .../patches}/debian/config/root/userdata.sh | 0 .../config/var/www/html/latest/.htaccess | 0 .../config/var/www/html/userdata/.htaccess | 0 .../patches}/debian/convert.sh | 0 .../patches}/debian/qemuconvert.sh | 0 .../patches}/debian/systemvm.vmx | 0 .../patches}/debian/systemvm.xml | 0 .../patches}/debian/vhdconvert.sh | 0 .../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/vpc_vpn_l2tp.sh | 0 .../debian/vpn/opt/cloud/bin/vpn_l2tp.sh | 0 .../patches}/debian/xe/xe-daemon | 0 .../patches}/debian/xe/xe-linux-distribution | 0 .../patches}/debian/xe/xe-update-guest-attrs | 0 systemvm/pom.xml | 260 ++++++++++++++++++ .../server => systemvm}/scripts/_run.sh | 0 .../scripts/config_auth.sh | 0 .../server => systemvm}/scripts/config_ssl.sh | 0 .../scripts/consoleproxy.sh | 0 .../server => systemvm}/scripts/ipfirewall.sh | 0 .../server => systemvm}/scripts/run-proxy.sh | 0 .../server => systemvm}/scripts/run.bat | 0 .../server => systemvm}/scripts/run.sh | 0 .../server => systemvm}/scripts/secstorage.sh | 0 .../systemvm-descriptor.xml | 10 +- .../server => systemvm}/ui/viewer-bad-sid.ftl | 0 .../ui/viewer-connect-failed.ftl | 0 .../server => systemvm}/ui/viewer-update.ftl | 0 .../server => systemvm}/ui/viewer.ftl | 0 .../server => systemvm}/vm-script/vmops | 0 180 files changed, 272 insertions(+), 253 deletions(-) rename {services/console-proxy/server => systemvm}/bindir/cloud-setup-console-proxy.in (100%) rename {services/console-proxy/server => systemvm}/certs/localhost.crt (100%) rename {services/console-proxy/server => systemvm}/certs/localhost.key (100%) rename {services/console-proxy/server => systemvm}/certs/realhostip.crt (100%) rename {services/console-proxy/server => systemvm}/certs/realhostip.csr (100%) rename {services/console-proxy/server => systemvm}/certs/realhostip.key (100%) rename {services/console-proxy/server => systemvm}/certs/realhostip.keystore (100%) rename {patches => systemvm}/cloudpatch-descriptor.xml (100%) rename {services/console-proxy/server => systemvm}/conf.dom0/agent.properties.in (100%) rename {services/console-proxy/server => systemvm}/conf.dom0/consoleproxy.properties.in (100%) rename {services/console-proxy/server => systemvm}/conf.dom0/log4j-cloud.xml.in (100%) rename {services/console-proxy/server => systemvm}/conf/agent.properties (100%) rename {services/console-proxy/server => systemvm}/conf/consoleproxy.properties (100%) rename {services/console-proxy/server => systemvm}/conf/environment.properties (100%) rename {services/console-proxy/server => systemvm}/conf/log4j-cloud.xml (100%) rename {services/console-proxy/server => systemvm}/css/ajaxviewer.css (100%) rename {services/console-proxy/server => systemvm}/css/logger.css (100%) rename {services/console-proxy/server => systemvm}/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in (100%) rename {services/console-proxy/server => systemvm}/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in (100%) rename {services/console-proxy/server => systemvm}/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in (100%) rename {services/console-proxy/server => systemvm}/distro/ubuntu/SYSCONFDIR/init.d/cloud-console-proxy.in (100%) rename {services/console-proxy/server => systemvm}/images/back.gif (100%) rename {services/console-proxy/server => systemvm}/images/bright-green.png (100%) rename {services/console-proxy/server => systemvm}/images/cad.gif (100%) rename {services/console-proxy/server => systemvm}/images/cannotconnect.jpg (100%) rename {services/console-proxy/server => systemvm}/images/clr_button.gif (100%) rename {services/console-proxy/server => systemvm}/images/clr_button_hover.gif (100%) rename {services/console-proxy/server => systemvm}/images/dot.cur (100%) rename {services/console-proxy/server => systemvm}/images/gray-green.png (100%) rename {services/console-proxy/server => systemvm}/images/grid_headerbg.gif (100%) rename {services/console-proxy/server => systemvm}/images/left.png (100%) rename {services/console-proxy/server => systemvm}/images/minimize_button.gif (100%) rename {services/console-proxy/server => systemvm}/images/minimize_button_hover.gif (100%) rename {services/console-proxy/server => systemvm}/images/notready.jpg (100%) rename {services/console-proxy/server => systemvm}/images/play_button.gif (100%) rename {services/console-proxy/server => systemvm}/images/play_button_hover.gif (100%) rename {services/console-proxy/server => systemvm}/images/right.png (100%) rename {services/console-proxy/server => systemvm}/images/right2.png (100%) rename {services/console-proxy/server => systemvm}/images/shrink_button.gif (100%) rename {services/console-proxy/server => systemvm}/images/shrink_button_hover.gif (100%) rename {services/console-proxy/server => systemvm}/images/stop_button.gif (100%) rename {services/console-proxy/server => systemvm}/images/stop_button_hover.gif (100%) rename {services/console-proxy/server => systemvm}/images/winlog.png (100%) rename {services/console-proxy/server => systemvm}/js/ajaxkeys.js (100%) rename {services/console-proxy/server => systemvm}/js/ajaxviewer.js (100%) rename {services/console-proxy/server => systemvm}/js/cloud.logger.js (100%) rename {services/console-proxy/server => systemvm}/js/handler.js (100%) rename {services/console-proxy/server => systemvm}/js/jquery.js (100%) rename {services/console-proxy/server => systemvm}/libexec/console-proxy-runner.in (100%) rename {patches/systemvm => systemvm/patches}/debian/README (100%) rename {patches/systemvm => systemvm/patches}/debian/buildsystemvm.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config.dat (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/apache2/httpd.conf (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/apache2/ports.conf (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/apache2/sites-available/default (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/apache2/sites-available/default-ssl (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/apache2/vhostexample.conf (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/cloud-nic.rules (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/cron.daily/cloud-cleanup (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/default/cloud (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/default/cloud-passwd-srvr (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/dnsmasq.conf.tmpl (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/haproxy/haproxy.cfg (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/init.d/cloud (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/init.d/cloud-early-config (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/init.d/cloud-passwd-srvr (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/init.d/postinit (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/iptables/iptables-consoleproxy (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/iptables/iptables-elbvm (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/iptables/iptables-ilbvm (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/iptables/iptables-router (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/iptables/iptables-secstorage (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/iptables/iptables-vpcrouter (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/iptables/rt_tables_init (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/iptables/rules (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/logrotate.conf (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/logrotate.d/apache2 (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/logrotate.d/dnsmasq (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/logrotate.d/haproxy (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/logrotate.d/ppp (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/logrotate.d/rsyslog (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/modprobe.d/aesni_intel (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/profile.d/cloud.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/rc.local (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/rsyslog.conf (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/ssh/sshd_config (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/sysctl.conf (100%) rename {patches/systemvm => systemvm/patches}/debian/config/etc/vpcdnsmasq.conf (100%) rename {patches/systemvm => systemvm/patches}/debian/config/opt/cloud/bin/checkbatchs2svpn.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/opt/cloud/bin/checks2svpn.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/opt/cloud/bin/cloud-nic.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/opt/cloud/bin/get_template_version.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/opt/cloud/bin/ilb.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/opt/cloud/bin/ipassoc.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/opt/cloud/bin/ipsectunnel.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/opt/cloud/bin/netusage.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/opt/cloud/bin/passwd_server (100%) rename {patches/systemvm => systemvm/patches}/debian/config/opt/cloud/bin/passwd_server_ip (100%) rename {patches/systemvm => systemvm/patches}/debian/config/opt/cloud/bin/patchsystemvm.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/opt/cloud/bin/serve_password.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/opt/cloud/bin/vmdata.py (100%) rename {patches/systemvm => systemvm/patches}/debian/config/opt/cloud/bin/vpc_acl.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/opt/cloud/bin/vpc_func.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/opt/cloud/bin/vpc_guestnw.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/opt/cloud/bin/vpc_ipassoc.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/opt/cloud/bin/vpc_loadbalancer.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/opt/cloud/bin/vpc_netusage.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/opt/cloud/bin/vpc_passwd_server (100%) rename {patches/systemvm => systemvm/patches}/debian/config/opt/cloud/bin/vpc_portforwarding.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/opt/cloud/bin/vpc_privateGateway.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/opt/cloud/bin/vpc_privategw_acl.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/opt/cloud/bin/vpc_snat.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/opt/cloud/bin/vpc_staticnat.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/opt/cloud/bin/vpc_staticroute.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/.ssh/authorized_keys (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/bumpup_priority.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/clearUsageRules.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/createIpAlias.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/deleteIpAlias.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/dnsmasq.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/edithosts.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/firewall.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/firewallRule_egress.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/firewall_rule.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/func.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/loadbalancer.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/reconfigLB.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/redundant_router/arping_gateways.sh.templ (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/redundant_router/backup.sh.templ (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/redundant_router/check_bumpup.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/redundant_router/check_heartbeat.sh.templ (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/redundant_router/checkrouter.sh.templ (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/redundant_router/conntrackd.conf.templ (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/redundant_router/disable_pubip.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/redundant_router/enable_pubip.sh.templ (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/redundant_router/fault.sh.templ (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/redundant_router/heartbeat.sh.templ (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/redundant_router/keepalived.conf.templ (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/redundant_router/master.sh.templ (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/redundant_router/primary-backup.sh.templ (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/redundant_router/services.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/savepassword.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/userdata.py (100%) rename {patches/systemvm => systemvm/patches}/debian/config/root/userdata.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/config/var/www/html/latest/.htaccess (100%) rename {patches/systemvm => systemvm/patches}/debian/config/var/www/html/userdata/.htaccess (100%) rename {patches/systemvm => systemvm/patches}/debian/convert.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/qemuconvert.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/systemvm.vmx (100%) rename {patches/systemvm => systemvm/patches}/debian/systemvm.xml (100%) rename {patches/systemvm => systemvm/patches}/debian/vhdconvert.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/vpn/etc/ipsec.conf (100%) rename {patches/systemvm => systemvm/patches}/debian/vpn/etc/ipsec.d/l2tp.conf (100%) rename {patches/systemvm => systemvm/patches}/debian/vpn/etc/ipsec.secrets (100%) rename {patches/systemvm => systemvm/patches}/debian/vpn/etc/ppp/options.xl2tpd (100%) rename {patches/systemvm => systemvm/patches}/debian/vpn/etc/xl2tpd/xl2tpd.conf (100%) rename {patches/systemvm => systemvm/patches}/debian/vpn/opt/cloud/bin/vpc_vpn_l2tp.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/vpn/opt/cloud/bin/vpn_l2tp.sh (100%) rename {patches/systemvm => systemvm/patches}/debian/xe/xe-daemon (100%) rename {patches/systemvm => systemvm/patches}/debian/xe/xe-linux-distribution (100%) rename {patches/systemvm => systemvm/patches}/debian/xe/xe-update-guest-attrs (100%) create mode 100644 systemvm/pom.xml rename {services/console-proxy/server => systemvm}/scripts/_run.sh (100%) rename {services/console-proxy/server => systemvm}/scripts/config_auth.sh (100%) rename {services/console-proxy/server => systemvm}/scripts/config_ssl.sh (100%) rename {services/console-proxy/server => systemvm}/scripts/consoleproxy.sh (100%) rename {services/console-proxy/server => systemvm}/scripts/ipfirewall.sh (100%) rename {services/console-proxy/server => systemvm}/scripts/run-proxy.sh (100%) rename {services/console-proxy/server => systemvm}/scripts/run.bat (100%) rename {services/console-proxy/server => systemvm}/scripts/run.sh (100%) rename {services/console-proxy/server => systemvm}/scripts/secstorage.sh (100%) rename {services/console-proxy/server => systemvm}/systemvm-descriptor.xml (91%) rename {services/console-proxy/server => systemvm}/ui/viewer-bad-sid.ftl (100%) rename {services/console-proxy/server => systemvm}/ui/viewer-connect-failed.ftl (100%) rename {services/console-proxy/server => systemvm}/ui/viewer-update.ftl (100%) rename {services/console-proxy/server => systemvm}/ui/viewer.ftl (100%) rename {services/console-proxy/server => systemvm}/vm-script/vmops (100%) diff --git a/client/pom.xml b/client/pom.xml index 119c96eddef..c09e10e7cb5 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -277,8 +277,9 @@ org.apache.cloudstack - cloud-console-proxy + cloud-systemvm ${project.version} + pom @@ -361,7 +362,7 @@ - + diff --git a/pom.xml b/pom.xml index 4bae29a3796..cb4dd1d0943 100644 --- a/pom.xml +++ b/pom.xml @@ -168,7 +168,6 @@ deps/XenServerJava engine plugins - patches framework test client @@ -680,6 +679,12 @@ awsapi + + systemvm + + systemvm + + eclipse diff --git a/services/console-proxy/server/pom.xml b/services/console-proxy/server/pom.xml index 391c15a5b29..114979025d8 100644 --- a/services/console-proxy/server/pom.xml +++ b/services/console-proxy/server/pom.xml @@ -26,9 +26,6 @@ 4.3.0-SNAPSHOT ../pom.xml - - mkisofs - log4j @@ -42,21 +39,9 @@ commons-codec commons-codec - org.apache.cloudstack - cloud-agent - ${project.version} - - - org.apache.cloudstack - cloud-patches - ${project.version} - pom - - - org.apache.cloudstack - cloud-secondary-storage + cloud-utils ${project.version} @@ -69,231 +54,5 @@ - - - maven-assembly-plugin - 2.3 - - systemvm - false - - systemvm-descriptor.xml - - - - - make-systemvm - package - - single - - - - - - maven-resources-plugin - 2.6 - - - copy-resources - - package - - copy-resources - - - dist - - - target - - systemvm.zip - - - - ../../../patches/systemvm/debian/config/root/.ssh - - authorized_keys - - - - - - - - - maven-antrun-plugin - 1.7 - - - copy-cloud-scripts - package - - run - - - - - - - - - - - maven-clean-plugin - 2.5 - - - - dist - false - - - target - false - - - - - - - - - - genisoimage - - - /usr/bin/genisoimage - - - - genisoimage - - - - vmware - - - nonoss - - - - - org.apache.cloudstack - cloud-plugin-hypervisor-vmware - ${project.version} - - - org.apache.cloudstack - cloud-vmware-base - ${project.version} - - - - - systemvm - - - systemvm - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - package - - exec - - - - - ${mkisofs} - dist - - -quiet - -r - -o - systemvm.iso - systemvm.zip - cloud-scripts.tgz - authorized_keys - - - - - - - - quickcloud - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - - java - - - - - com.cloud.agent.AgentShell - - zone=1 - pod=1 - host=192.168.56.1 - guid=ConsoleProxy.1 - - - - javax.net.ssl.trustStore - certs/realhostip.keystore - log.home - ${PWD}/ - - - - - - - - - diff --git a/services/console-proxy/server/bindir/cloud-setup-console-proxy.in b/systemvm/bindir/cloud-setup-console-proxy.in similarity index 100% rename from services/console-proxy/server/bindir/cloud-setup-console-proxy.in rename to systemvm/bindir/cloud-setup-console-proxy.in diff --git a/services/console-proxy/server/certs/localhost.crt b/systemvm/certs/localhost.crt similarity index 100% rename from services/console-proxy/server/certs/localhost.crt rename to systemvm/certs/localhost.crt diff --git a/services/console-proxy/server/certs/localhost.key b/systemvm/certs/localhost.key similarity index 100% rename from services/console-proxy/server/certs/localhost.key rename to systemvm/certs/localhost.key diff --git a/services/console-proxy/server/certs/realhostip.crt b/systemvm/certs/realhostip.crt similarity index 100% rename from services/console-proxy/server/certs/realhostip.crt rename to systemvm/certs/realhostip.crt diff --git a/services/console-proxy/server/certs/realhostip.csr b/systemvm/certs/realhostip.csr similarity index 100% rename from services/console-proxy/server/certs/realhostip.csr rename to systemvm/certs/realhostip.csr diff --git a/services/console-proxy/server/certs/realhostip.key b/systemvm/certs/realhostip.key similarity index 100% rename from services/console-proxy/server/certs/realhostip.key rename to systemvm/certs/realhostip.key diff --git a/services/console-proxy/server/certs/realhostip.keystore b/systemvm/certs/realhostip.keystore similarity index 100% rename from services/console-proxy/server/certs/realhostip.keystore rename to systemvm/certs/realhostip.keystore diff --git a/patches/cloudpatch-descriptor.xml b/systemvm/cloudpatch-descriptor.xml similarity index 100% rename from patches/cloudpatch-descriptor.xml rename to systemvm/cloudpatch-descriptor.xml diff --git a/services/console-proxy/server/conf.dom0/agent.properties.in b/systemvm/conf.dom0/agent.properties.in similarity index 100% rename from services/console-proxy/server/conf.dom0/agent.properties.in rename to systemvm/conf.dom0/agent.properties.in diff --git a/services/console-proxy/server/conf.dom0/consoleproxy.properties.in b/systemvm/conf.dom0/consoleproxy.properties.in similarity index 100% rename from services/console-proxy/server/conf.dom0/consoleproxy.properties.in rename to systemvm/conf.dom0/consoleproxy.properties.in diff --git a/services/console-proxy/server/conf.dom0/log4j-cloud.xml.in b/systemvm/conf.dom0/log4j-cloud.xml.in similarity index 100% rename from services/console-proxy/server/conf.dom0/log4j-cloud.xml.in rename to systemvm/conf.dom0/log4j-cloud.xml.in diff --git a/services/console-proxy/server/conf/agent.properties b/systemvm/conf/agent.properties similarity index 100% rename from services/console-proxy/server/conf/agent.properties rename to systemvm/conf/agent.properties diff --git a/services/console-proxy/server/conf/consoleproxy.properties b/systemvm/conf/consoleproxy.properties similarity index 100% rename from services/console-proxy/server/conf/consoleproxy.properties rename to systemvm/conf/consoleproxy.properties diff --git a/services/console-proxy/server/conf/environment.properties b/systemvm/conf/environment.properties similarity index 100% rename from services/console-proxy/server/conf/environment.properties rename to systemvm/conf/environment.properties diff --git a/services/console-proxy/server/conf/log4j-cloud.xml b/systemvm/conf/log4j-cloud.xml similarity index 100% rename from services/console-proxy/server/conf/log4j-cloud.xml rename to systemvm/conf/log4j-cloud.xml diff --git a/services/console-proxy/server/css/ajaxviewer.css b/systemvm/css/ajaxviewer.css similarity index 100% rename from services/console-proxy/server/css/ajaxviewer.css rename to systemvm/css/ajaxviewer.css diff --git a/services/console-proxy/server/css/logger.css b/systemvm/css/logger.css similarity index 100% rename from services/console-proxy/server/css/logger.css rename to systemvm/css/logger.css diff --git a/services/console-proxy/server/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in b/systemvm/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in similarity index 100% rename from services/console-proxy/server/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in rename to systemvm/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in diff --git a/services/console-proxy/server/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in b/systemvm/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in similarity index 100% rename from services/console-proxy/server/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in rename to systemvm/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in diff --git a/services/console-proxy/server/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in b/systemvm/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in similarity index 100% rename from services/console-proxy/server/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in rename to systemvm/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-console-proxy.in diff --git a/services/console-proxy/server/distro/ubuntu/SYSCONFDIR/init.d/cloud-console-proxy.in b/systemvm/distro/ubuntu/SYSCONFDIR/init.d/cloud-console-proxy.in similarity index 100% rename from services/console-proxy/server/distro/ubuntu/SYSCONFDIR/init.d/cloud-console-proxy.in rename to systemvm/distro/ubuntu/SYSCONFDIR/init.d/cloud-console-proxy.in diff --git a/services/console-proxy/server/images/back.gif b/systemvm/images/back.gif similarity index 100% rename from services/console-proxy/server/images/back.gif rename to systemvm/images/back.gif diff --git a/services/console-proxy/server/images/bright-green.png b/systemvm/images/bright-green.png similarity index 100% rename from services/console-proxy/server/images/bright-green.png rename to systemvm/images/bright-green.png diff --git a/services/console-proxy/server/images/cad.gif b/systemvm/images/cad.gif similarity index 100% rename from services/console-proxy/server/images/cad.gif rename to systemvm/images/cad.gif diff --git a/services/console-proxy/server/images/cannotconnect.jpg b/systemvm/images/cannotconnect.jpg similarity index 100% rename from services/console-proxy/server/images/cannotconnect.jpg rename to systemvm/images/cannotconnect.jpg diff --git a/services/console-proxy/server/images/clr_button.gif b/systemvm/images/clr_button.gif similarity index 100% rename from services/console-proxy/server/images/clr_button.gif rename to systemvm/images/clr_button.gif diff --git a/services/console-proxy/server/images/clr_button_hover.gif b/systemvm/images/clr_button_hover.gif similarity index 100% rename from services/console-proxy/server/images/clr_button_hover.gif rename to systemvm/images/clr_button_hover.gif diff --git a/services/console-proxy/server/images/dot.cur b/systemvm/images/dot.cur similarity index 100% rename from services/console-proxy/server/images/dot.cur rename to systemvm/images/dot.cur diff --git a/services/console-proxy/server/images/gray-green.png b/systemvm/images/gray-green.png similarity index 100% rename from services/console-proxy/server/images/gray-green.png rename to systemvm/images/gray-green.png diff --git a/services/console-proxy/server/images/grid_headerbg.gif b/systemvm/images/grid_headerbg.gif similarity index 100% rename from services/console-proxy/server/images/grid_headerbg.gif rename to systemvm/images/grid_headerbg.gif diff --git a/services/console-proxy/server/images/left.png b/systemvm/images/left.png similarity index 100% rename from services/console-proxy/server/images/left.png rename to systemvm/images/left.png diff --git a/services/console-proxy/server/images/minimize_button.gif b/systemvm/images/minimize_button.gif similarity index 100% rename from services/console-proxy/server/images/minimize_button.gif rename to systemvm/images/minimize_button.gif diff --git a/services/console-proxy/server/images/minimize_button_hover.gif b/systemvm/images/minimize_button_hover.gif similarity index 100% rename from services/console-proxy/server/images/minimize_button_hover.gif rename to systemvm/images/minimize_button_hover.gif diff --git a/services/console-proxy/server/images/notready.jpg b/systemvm/images/notready.jpg similarity index 100% rename from services/console-proxy/server/images/notready.jpg rename to systemvm/images/notready.jpg diff --git a/services/console-proxy/server/images/play_button.gif b/systemvm/images/play_button.gif similarity index 100% rename from services/console-proxy/server/images/play_button.gif rename to systemvm/images/play_button.gif diff --git a/services/console-proxy/server/images/play_button_hover.gif b/systemvm/images/play_button_hover.gif similarity index 100% rename from services/console-proxy/server/images/play_button_hover.gif rename to systemvm/images/play_button_hover.gif diff --git a/services/console-proxy/server/images/right.png b/systemvm/images/right.png similarity index 100% rename from services/console-proxy/server/images/right.png rename to systemvm/images/right.png diff --git a/services/console-proxy/server/images/right2.png b/systemvm/images/right2.png similarity index 100% rename from services/console-proxy/server/images/right2.png rename to systemvm/images/right2.png diff --git a/services/console-proxy/server/images/shrink_button.gif b/systemvm/images/shrink_button.gif similarity index 100% rename from services/console-proxy/server/images/shrink_button.gif rename to systemvm/images/shrink_button.gif diff --git a/services/console-proxy/server/images/shrink_button_hover.gif b/systemvm/images/shrink_button_hover.gif similarity index 100% rename from services/console-proxy/server/images/shrink_button_hover.gif rename to systemvm/images/shrink_button_hover.gif diff --git a/services/console-proxy/server/images/stop_button.gif b/systemvm/images/stop_button.gif similarity index 100% rename from services/console-proxy/server/images/stop_button.gif rename to systemvm/images/stop_button.gif diff --git a/services/console-proxy/server/images/stop_button_hover.gif b/systemvm/images/stop_button_hover.gif similarity index 100% rename from services/console-proxy/server/images/stop_button_hover.gif rename to systemvm/images/stop_button_hover.gif diff --git a/services/console-proxy/server/images/winlog.png b/systemvm/images/winlog.png similarity index 100% rename from services/console-proxy/server/images/winlog.png rename to systemvm/images/winlog.png diff --git a/services/console-proxy/server/js/ajaxkeys.js b/systemvm/js/ajaxkeys.js similarity index 100% rename from services/console-proxy/server/js/ajaxkeys.js rename to systemvm/js/ajaxkeys.js diff --git a/services/console-proxy/server/js/ajaxviewer.js b/systemvm/js/ajaxviewer.js similarity index 100% rename from services/console-proxy/server/js/ajaxviewer.js rename to systemvm/js/ajaxviewer.js diff --git a/services/console-proxy/server/js/cloud.logger.js b/systemvm/js/cloud.logger.js similarity index 100% rename from services/console-proxy/server/js/cloud.logger.js rename to systemvm/js/cloud.logger.js diff --git a/services/console-proxy/server/js/handler.js b/systemvm/js/handler.js similarity index 100% rename from services/console-proxy/server/js/handler.js rename to systemvm/js/handler.js diff --git a/services/console-proxy/server/js/jquery.js b/systemvm/js/jquery.js similarity index 100% rename from services/console-proxy/server/js/jquery.js rename to systemvm/js/jquery.js diff --git a/services/console-proxy/server/libexec/console-proxy-runner.in b/systemvm/libexec/console-proxy-runner.in similarity index 100% rename from services/console-proxy/server/libexec/console-proxy-runner.in rename to systemvm/libexec/console-proxy-runner.in diff --git a/patches/systemvm/debian/README b/systemvm/patches/debian/README similarity index 100% rename from patches/systemvm/debian/README rename to systemvm/patches/debian/README diff --git a/patches/systemvm/debian/buildsystemvm.sh b/systemvm/patches/debian/buildsystemvm.sh similarity index 100% rename from patches/systemvm/debian/buildsystemvm.sh rename to systemvm/patches/debian/buildsystemvm.sh diff --git a/patches/systemvm/debian/config.dat b/systemvm/patches/debian/config.dat similarity index 100% rename from patches/systemvm/debian/config.dat rename to systemvm/patches/debian/config.dat diff --git a/patches/systemvm/debian/config/etc/apache2/httpd.conf b/systemvm/patches/debian/config/etc/apache2/httpd.conf similarity index 100% rename from patches/systemvm/debian/config/etc/apache2/httpd.conf rename to systemvm/patches/debian/config/etc/apache2/httpd.conf diff --git a/patches/systemvm/debian/config/etc/apache2/ports.conf b/systemvm/patches/debian/config/etc/apache2/ports.conf similarity index 100% rename from patches/systemvm/debian/config/etc/apache2/ports.conf rename to systemvm/patches/debian/config/etc/apache2/ports.conf diff --git a/patches/systemvm/debian/config/etc/apache2/sites-available/default b/systemvm/patches/debian/config/etc/apache2/sites-available/default similarity index 100% rename from patches/systemvm/debian/config/etc/apache2/sites-available/default rename to systemvm/patches/debian/config/etc/apache2/sites-available/default diff --git a/patches/systemvm/debian/config/etc/apache2/sites-available/default-ssl b/systemvm/patches/debian/config/etc/apache2/sites-available/default-ssl similarity index 100% rename from patches/systemvm/debian/config/etc/apache2/sites-available/default-ssl rename to systemvm/patches/debian/config/etc/apache2/sites-available/default-ssl diff --git a/patches/systemvm/debian/config/etc/apache2/vhostexample.conf b/systemvm/patches/debian/config/etc/apache2/vhostexample.conf similarity index 100% rename from patches/systemvm/debian/config/etc/apache2/vhostexample.conf rename to systemvm/patches/debian/config/etc/apache2/vhostexample.conf diff --git a/patches/systemvm/debian/config/etc/cloud-nic.rules b/systemvm/patches/debian/config/etc/cloud-nic.rules similarity index 100% rename from patches/systemvm/debian/config/etc/cloud-nic.rules rename to systemvm/patches/debian/config/etc/cloud-nic.rules diff --git a/patches/systemvm/debian/config/etc/cron.daily/cloud-cleanup b/systemvm/patches/debian/config/etc/cron.daily/cloud-cleanup similarity index 100% rename from patches/systemvm/debian/config/etc/cron.daily/cloud-cleanup rename to systemvm/patches/debian/config/etc/cron.daily/cloud-cleanup diff --git a/patches/systemvm/debian/config/etc/default/cloud b/systemvm/patches/debian/config/etc/default/cloud similarity index 100% rename from patches/systemvm/debian/config/etc/default/cloud rename to systemvm/patches/debian/config/etc/default/cloud diff --git a/patches/systemvm/debian/config/etc/default/cloud-passwd-srvr b/systemvm/patches/debian/config/etc/default/cloud-passwd-srvr similarity index 100% rename from patches/systemvm/debian/config/etc/default/cloud-passwd-srvr rename to systemvm/patches/debian/config/etc/default/cloud-passwd-srvr diff --git a/patches/systemvm/debian/config/etc/dnsmasq.conf.tmpl b/systemvm/patches/debian/config/etc/dnsmasq.conf.tmpl similarity index 100% rename from patches/systemvm/debian/config/etc/dnsmasq.conf.tmpl rename to systemvm/patches/debian/config/etc/dnsmasq.conf.tmpl diff --git a/patches/systemvm/debian/config/etc/haproxy/haproxy.cfg b/systemvm/patches/debian/config/etc/haproxy/haproxy.cfg similarity index 100% rename from patches/systemvm/debian/config/etc/haproxy/haproxy.cfg rename to systemvm/patches/debian/config/etc/haproxy/haproxy.cfg diff --git a/patches/systemvm/debian/config/etc/init.d/cloud b/systemvm/patches/debian/config/etc/init.d/cloud similarity index 100% rename from patches/systemvm/debian/config/etc/init.d/cloud rename to systemvm/patches/debian/config/etc/init.d/cloud diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config b/systemvm/patches/debian/config/etc/init.d/cloud-early-config similarity index 100% rename from patches/systemvm/debian/config/etc/init.d/cloud-early-config rename to systemvm/patches/debian/config/etc/init.d/cloud-early-config diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-passwd-srvr b/systemvm/patches/debian/config/etc/init.d/cloud-passwd-srvr similarity index 100% rename from patches/systemvm/debian/config/etc/init.d/cloud-passwd-srvr rename to systemvm/patches/debian/config/etc/init.d/cloud-passwd-srvr diff --git a/patches/systemvm/debian/config/etc/init.d/postinit b/systemvm/patches/debian/config/etc/init.d/postinit similarity index 100% rename from patches/systemvm/debian/config/etc/init.d/postinit rename to systemvm/patches/debian/config/etc/init.d/postinit diff --git a/patches/systemvm/debian/config/etc/iptables/iptables-consoleproxy b/systemvm/patches/debian/config/etc/iptables/iptables-consoleproxy similarity index 100% rename from patches/systemvm/debian/config/etc/iptables/iptables-consoleproxy rename to systemvm/patches/debian/config/etc/iptables/iptables-consoleproxy diff --git a/patches/systemvm/debian/config/etc/iptables/iptables-elbvm b/systemvm/patches/debian/config/etc/iptables/iptables-elbvm similarity index 100% rename from patches/systemvm/debian/config/etc/iptables/iptables-elbvm rename to systemvm/patches/debian/config/etc/iptables/iptables-elbvm diff --git a/patches/systemvm/debian/config/etc/iptables/iptables-ilbvm b/systemvm/patches/debian/config/etc/iptables/iptables-ilbvm similarity index 100% rename from patches/systemvm/debian/config/etc/iptables/iptables-ilbvm rename to systemvm/patches/debian/config/etc/iptables/iptables-ilbvm diff --git a/patches/systemvm/debian/config/etc/iptables/iptables-router b/systemvm/patches/debian/config/etc/iptables/iptables-router similarity index 100% rename from patches/systemvm/debian/config/etc/iptables/iptables-router rename to systemvm/patches/debian/config/etc/iptables/iptables-router diff --git a/patches/systemvm/debian/config/etc/iptables/iptables-secstorage b/systemvm/patches/debian/config/etc/iptables/iptables-secstorage similarity index 100% rename from patches/systemvm/debian/config/etc/iptables/iptables-secstorage rename to systemvm/patches/debian/config/etc/iptables/iptables-secstorage diff --git a/patches/systemvm/debian/config/etc/iptables/iptables-vpcrouter b/systemvm/patches/debian/config/etc/iptables/iptables-vpcrouter similarity index 100% rename from patches/systemvm/debian/config/etc/iptables/iptables-vpcrouter rename to systemvm/patches/debian/config/etc/iptables/iptables-vpcrouter diff --git a/patches/systemvm/debian/config/etc/iptables/rt_tables_init b/systemvm/patches/debian/config/etc/iptables/rt_tables_init similarity index 100% rename from patches/systemvm/debian/config/etc/iptables/rt_tables_init rename to systemvm/patches/debian/config/etc/iptables/rt_tables_init diff --git a/patches/systemvm/debian/config/etc/iptables/rules b/systemvm/patches/debian/config/etc/iptables/rules similarity index 100% rename from patches/systemvm/debian/config/etc/iptables/rules rename to systemvm/patches/debian/config/etc/iptables/rules diff --git a/patches/systemvm/debian/config/etc/logrotate.conf b/systemvm/patches/debian/config/etc/logrotate.conf similarity index 100% rename from patches/systemvm/debian/config/etc/logrotate.conf rename to systemvm/patches/debian/config/etc/logrotate.conf diff --git a/patches/systemvm/debian/config/etc/logrotate.d/apache2 b/systemvm/patches/debian/config/etc/logrotate.d/apache2 similarity index 100% rename from patches/systemvm/debian/config/etc/logrotate.d/apache2 rename to systemvm/patches/debian/config/etc/logrotate.d/apache2 diff --git a/patches/systemvm/debian/config/etc/logrotate.d/dnsmasq b/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq similarity index 100% rename from patches/systemvm/debian/config/etc/logrotate.d/dnsmasq rename to systemvm/patches/debian/config/etc/logrotate.d/dnsmasq diff --git a/patches/systemvm/debian/config/etc/logrotate.d/haproxy b/systemvm/patches/debian/config/etc/logrotate.d/haproxy similarity index 100% rename from patches/systemvm/debian/config/etc/logrotate.d/haproxy rename to systemvm/patches/debian/config/etc/logrotate.d/haproxy diff --git a/patches/systemvm/debian/config/etc/logrotate.d/ppp b/systemvm/patches/debian/config/etc/logrotate.d/ppp similarity index 100% rename from patches/systemvm/debian/config/etc/logrotate.d/ppp rename to systemvm/patches/debian/config/etc/logrotate.d/ppp diff --git a/patches/systemvm/debian/config/etc/logrotate.d/rsyslog b/systemvm/patches/debian/config/etc/logrotate.d/rsyslog similarity index 100% rename from patches/systemvm/debian/config/etc/logrotate.d/rsyslog rename to systemvm/patches/debian/config/etc/logrotate.d/rsyslog diff --git a/patches/systemvm/debian/config/etc/modprobe.d/aesni_intel b/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel similarity index 100% rename from patches/systemvm/debian/config/etc/modprobe.d/aesni_intel rename to systemvm/patches/debian/config/etc/modprobe.d/aesni_intel diff --git a/patches/systemvm/debian/config/etc/profile.d/cloud.sh b/systemvm/patches/debian/config/etc/profile.d/cloud.sh similarity index 100% rename from patches/systemvm/debian/config/etc/profile.d/cloud.sh rename to systemvm/patches/debian/config/etc/profile.d/cloud.sh diff --git a/patches/systemvm/debian/config/etc/rc.local b/systemvm/patches/debian/config/etc/rc.local similarity index 100% rename from patches/systemvm/debian/config/etc/rc.local rename to systemvm/patches/debian/config/etc/rc.local diff --git a/patches/systemvm/debian/config/etc/rsyslog.conf b/systemvm/patches/debian/config/etc/rsyslog.conf similarity index 100% rename from patches/systemvm/debian/config/etc/rsyslog.conf rename to systemvm/patches/debian/config/etc/rsyslog.conf diff --git a/patches/systemvm/debian/config/etc/ssh/sshd_config b/systemvm/patches/debian/config/etc/ssh/sshd_config similarity index 100% rename from patches/systemvm/debian/config/etc/ssh/sshd_config rename to systemvm/patches/debian/config/etc/ssh/sshd_config diff --git a/patches/systemvm/debian/config/etc/sysctl.conf b/systemvm/patches/debian/config/etc/sysctl.conf similarity index 100% rename from patches/systemvm/debian/config/etc/sysctl.conf rename to systemvm/patches/debian/config/etc/sysctl.conf diff --git a/patches/systemvm/debian/config/etc/vpcdnsmasq.conf b/systemvm/patches/debian/config/etc/vpcdnsmasq.conf similarity index 100% rename from patches/systemvm/debian/config/etc/vpcdnsmasq.conf rename to systemvm/patches/debian/config/etc/vpcdnsmasq.conf diff --git a/patches/systemvm/debian/config/opt/cloud/bin/checkbatchs2svpn.sh b/systemvm/patches/debian/config/opt/cloud/bin/checkbatchs2svpn.sh similarity index 100% rename from patches/systemvm/debian/config/opt/cloud/bin/checkbatchs2svpn.sh rename to systemvm/patches/debian/config/opt/cloud/bin/checkbatchs2svpn.sh diff --git a/patches/systemvm/debian/config/opt/cloud/bin/checks2svpn.sh b/systemvm/patches/debian/config/opt/cloud/bin/checks2svpn.sh similarity index 100% rename from patches/systemvm/debian/config/opt/cloud/bin/checks2svpn.sh rename to systemvm/patches/debian/config/opt/cloud/bin/checks2svpn.sh diff --git a/patches/systemvm/debian/config/opt/cloud/bin/cloud-nic.sh b/systemvm/patches/debian/config/opt/cloud/bin/cloud-nic.sh similarity index 100% rename from patches/systemvm/debian/config/opt/cloud/bin/cloud-nic.sh rename to systemvm/patches/debian/config/opt/cloud/bin/cloud-nic.sh diff --git a/patches/systemvm/debian/config/opt/cloud/bin/get_template_version.sh b/systemvm/patches/debian/config/opt/cloud/bin/get_template_version.sh similarity index 100% rename from patches/systemvm/debian/config/opt/cloud/bin/get_template_version.sh rename to systemvm/patches/debian/config/opt/cloud/bin/get_template_version.sh diff --git a/patches/systemvm/debian/config/opt/cloud/bin/ilb.sh b/systemvm/patches/debian/config/opt/cloud/bin/ilb.sh similarity index 100% rename from patches/systemvm/debian/config/opt/cloud/bin/ilb.sh rename to systemvm/patches/debian/config/opt/cloud/bin/ilb.sh diff --git a/patches/systemvm/debian/config/opt/cloud/bin/ipassoc.sh b/systemvm/patches/debian/config/opt/cloud/bin/ipassoc.sh similarity index 100% rename from patches/systemvm/debian/config/opt/cloud/bin/ipassoc.sh rename to systemvm/patches/debian/config/opt/cloud/bin/ipassoc.sh diff --git a/patches/systemvm/debian/config/opt/cloud/bin/ipsectunnel.sh b/systemvm/patches/debian/config/opt/cloud/bin/ipsectunnel.sh similarity index 100% rename from patches/systemvm/debian/config/opt/cloud/bin/ipsectunnel.sh rename to systemvm/patches/debian/config/opt/cloud/bin/ipsectunnel.sh diff --git a/patches/systemvm/debian/config/opt/cloud/bin/netusage.sh b/systemvm/patches/debian/config/opt/cloud/bin/netusage.sh similarity index 100% rename from patches/systemvm/debian/config/opt/cloud/bin/netusage.sh rename to systemvm/patches/debian/config/opt/cloud/bin/netusage.sh diff --git a/patches/systemvm/debian/config/opt/cloud/bin/passwd_server b/systemvm/patches/debian/config/opt/cloud/bin/passwd_server similarity index 100% rename from patches/systemvm/debian/config/opt/cloud/bin/passwd_server rename to systemvm/patches/debian/config/opt/cloud/bin/passwd_server diff --git a/patches/systemvm/debian/config/opt/cloud/bin/passwd_server_ip b/systemvm/patches/debian/config/opt/cloud/bin/passwd_server_ip similarity index 100% rename from patches/systemvm/debian/config/opt/cloud/bin/passwd_server_ip rename to systemvm/patches/debian/config/opt/cloud/bin/passwd_server_ip diff --git a/patches/systemvm/debian/config/opt/cloud/bin/patchsystemvm.sh b/systemvm/patches/debian/config/opt/cloud/bin/patchsystemvm.sh similarity index 100% rename from patches/systemvm/debian/config/opt/cloud/bin/patchsystemvm.sh rename to systemvm/patches/debian/config/opt/cloud/bin/patchsystemvm.sh diff --git a/patches/systemvm/debian/config/opt/cloud/bin/serve_password.sh b/systemvm/patches/debian/config/opt/cloud/bin/serve_password.sh similarity index 100% rename from patches/systemvm/debian/config/opt/cloud/bin/serve_password.sh rename to systemvm/patches/debian/config/opt/cloud/bin/serve_password.sh diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vmdata.py b/systemvm/patches/debian/config/opt/cloud/bin/vmdata.py similarity index 100% rename from patches/systemvm/debian/config/opt/cloud/bin/vmdata.py rename to systemvm/patches/debian/config/opt/cloud/bin/vmdata.py diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_acl.sh b/systemvm/patches/debian/config/opt/cloud/bin/vpc_acl.sh similarity index 100% rename from patches/systemvm/debian/config/opt/cloud/bin/vpc_acl.sh rename to systemvm/patches/debian/config/opt/cloud/bin/vpc_acl.sh diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_func.sh b/systemvm/patches/debian/config/opt/cloud/bin/vpc_func.sh similarity index 100% rename from patches/systemvm/debian/config/opt/cloud/bin/vpc_func.sh rename to systemvm/patches/debian/config/opt/cloud/bin/vpc_func.sh diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh b/systemvm/patches/debian/config/opt/cloud/bin/vpc_guestnw.sh similarity index 100% rename from patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh rename to systemvm/patches/debian/config/opt/cloud/bin/vpc_guestnw.sh diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_ipassoc.sh b/systemvm/patches/debian/config/opt/cloud/bin/vpc_ipassoc.sh similarity index 100% rename from patches/systemvm/debian/config/opt/cloud/bin/vpc_ipassoc.sh rename to systemvm/patches/debian/config/opt/cloud/bin/vpc_ipassoc.sh diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_loadbalancer.sh b/systemvm/patches/debian/config/opt/cloud/bin/vpc_loadbalancer.sh similarity index 100% rename from patches/systemvm/debian/config/opt/cloud/bin/vpc_loadbalancer.sh rename to systemvm/patches/debian/config/opt/cloud/bin/vpc_loadbalancer.sh diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_netusage.sh b/systemvm/patches/debian/config/opt/cloud/bin/vpc_netusage.sh similarity index 100% rename from patches/systemvm/debian/config/opt/cloud/bin/vpc_netusage.sh rename to systemvm/patches/debian/config/opt/cloud/bin/vpc_netusage.sh diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_passwd_server b/systemvm/patches/debian/config/opt/cloud/bin/vpc_passwd_server similarity index 100% rename from patches/systemvm/debian/config/opt/cloud/bin/vpc_passwd_server rename to systemvm/patches/debian/config/opt/cloud/bin/vpc_passwd_server diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_portforwarding.sh b/systemvm/patches/debian/config/opt/cloud/bin/vpc_portforwarding.sh similarity index 100% rename from patches/systemvm/debian/config/opt/cloud/bin/vpc_portforwarding.sh rename to systemvm/patches/debian/config/opt/cloud/bin/vpc_portforwarding.sh diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_privateGateway.sh b/systemvm/patches/debian/config/opt/cloud/bin/vpc_privateGateway.sh similarity index 100% rename from patches/systemvm/debian/config/opt/cloud/bin/vpc_privateGateway.sh rename to systemvm/patches/debian/config/opt/cloud/bin/vpc_privateGateway.sh diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_privategw_acl.sh b/systemvm/patches/debian/config/opt/cloud/bin/vpc_privategw_acl.sh similarity index 100% rename from patches/systemvm/debian/config/opt/cloud/bin/vpc_privategw_acl.sh rename to systemvm/patches/debian/config/opt/cloud/bin/vpc_privategw_acl.sh diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_snat.sh b/systemvm/patches/debian/config/opt/cloud/bin/vpc_snat.sh similarity index 100% rename from patches/systemvm/debian/config/opt/cloud/bin/vpc_snat.sh rename to systemvm/patches/debian/config/opt/cloud/bin/vpc_snat.sh diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_staticnat.sh b/systemvm/patches/debian/config/opt/cloud/bin/vpc_staticnat.sh similarity index 100% rename from patches/systemvm/debian/config/opt/cloud/bin/vpc_staticnat.sh rename to systemvm/patches/debian/config/opt/cloud/bin/vpc_staticnat.sh diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_staticroute.sh b/systemvm/patches/debian/config/opt/cloud/bin/vpc_staticroute.sh similarity index 100% rename from patches/systemvm/debian/config/opt/cloud/bin/vpc_staticroute.sh rename to systemvm/patches/debian/config/opt/cloud/bin/vpc_staticroute.sh diff --git a/patches/systemvm/debian/config/root/.ssh/authorized_keys b/systemvm/patches/debian/config/root/.ssh/authorized_keys similarity index 100% rename from patches/systemvm/debian/config/root/.ssh/authorized_keys rename to systemvm/patches/debian/config/root/.ssh/authorized_keys diff --git a/patches/systemvm/debian/config/root/bumpup_priority.sh b/systemvm/patches/debian/config/root/bumpup_priority.sh similarity index 100% rename from patches/systemvm/debian/config/root/bumpup_priority.sh rename to systemvm/patches/debian/config/root/bumpup_priority.sh diff --git a/patches/systemvm/debian/config/root/clearUsageRules.sh b/systemvm/patches/debian/config/root/clearUsageRules.sh similarity index 100% rename from patches/systemvm/debian/config/root/clearUsageRules.sh rename to systemvm/patches/debian/config/root/clearUsageRules.sh diff --git a/patches/systemvm/debian/config/root/createIpAlias.sh b/systemvm/patches/debian/config/root/createIpAlias.sh similarity index 100% rename from patches/systemvm/debian/config/root/createIpAlias.sh rename to systemvm/patches/debian/config/root/createIpAlias.sh diff --git a/patches/systemvm/debian/config/root/deleteIpAlias.sh b/systemvm/patches/debian/config/root/deleteIpAlias.sh similarity index 100% rename from patches/systemvm/debian/config/root/deleteIpAlias.sh rename to systemvm/patches/debian/config/root/deleteIpAlias.sh diff --git a/patches/systemvm/debian/config/root/dnsmasq.sh b/systemvm/patches/debian/config/root/dnsmasq.sh similarity index 100% rename from patches/systemvm/debian/config/root/dnsmasq.sh rename to systemvm/patches/debian/config/root/dnsmasq.sh diff --git a/patches/systemvm/debian/config/root/edithosts.sh b/systemvm/patches/debian/config/root/edithosts.sh similarity index 100% rename from patches/systemvm/debian/config/root/edithosts.sh rename to systemvm/patches/debian/config/root/edithosts.sh diff --git a/patches/systemvm/debian/config/root/firewall.sh b/systemvm/patches/debian/config/root/firewall.sh similarity index 100% rename from patches/systemvm/debian/config/root/firewall.sh rename to systemvm/patches/debian/config/root/firewall.sh diff --git a/patches/systemvm/debian/config/root/firewallRule_egress.sh b/systemvm/patches/debian/config/root/firewallRule_egress.sh similarity index 100% rename from patches/systemvm/debian/config/root/firewallRule_egress.sh rename to systemvm/patches/debian/config/root/firewallRule_egress.sh diff --git a/patches/systemvm/debian/config/root/firewall_rule.sh b/systemvm/patches/debian/config/root/firewall_rule.sh similarity index 100% rename from patches/systemvm/debian/config/root/firewall_rule.sh rename to systemvm/patches/debian/config/root/firewall_rule.sh diff --git a/patches/systemvm/debian/config/root/func.sh b/systemvm/patches/debian/config/root/func.sh similarity index 100% rename from patches/systemvm/debian/config/root/func.sh rename to systemvm/patches/debian/config/root/func.sh diff --git a/patches/systemvm/debian/config/root/loadbalancer.sh b/systemvm/patches/debian/config/root/loadbalancer.sh similarity index 100% rename from patches/systemvm/debian/config/root/loadbalancer.sh rename to systemvm/patches/debian/config/root/loadbalancer.sh diff --git a/patches/systemvm/debian/config/root/reconfigLB.sh b/systemvm/patches/debian/config/root/reconfigLB.sh similarity index 100% rename from patches/systemvm/debian/config/root/reconfigLB.sh rename to systemvm/patches/debian/config/root/reconfigLB.sh diff --git a/patches/systemvm/debian/config/root/redundant_router/arping_gateways.sh.templ b/systemvm/patches/debian/config/root/redundant_router/arping_gateways.sh.templ similarity index 100% rename from patches/systemvm/debian/config/root/redundant_router/arping_gateways.sh.templ rename to systemvm/patches/debian/config/root/redundant_router/arping_gateways.sh.templ diff --git a/patches/systemvm/debian/config/root/redundant_router/backup.sh.templ b/systemvm/patches/debian/config/root/redundant_router/backup.sh.templ similarity index 100% rename from patches/systemvm/debian/config/root/redundant_router/backup.sh.templ rename to systemvm/patches/debian/config/root/redundant_router/backup.sh.templ diff --git a/patches/systemvm/debian/config/root/redundant_router/check_bumpup.sh b/systemvm/patches/debian/config/root/redundant_router/check_bumpup.sh similarity index 100% rename from patches/systemvm/debian/config/root/redundant_router/check_bumpup.sh rename to systemvm/patches/debian/config/root/redundant_router/check_bumpup.sh diff --git a/patches/systemvm/debian/config/root/redundant_router/check_heartbeat.sh.templ b/systemvm/patches/debian/config/root/redundant_router/check_heartbeat.sh.templ similarity index 100% rename from patches/systemvm/debian/config/root/redundant_router/check_heartbeat.sh.templ rename to systemvm/patches/debian/config/root/redundant_router/check_heartbeat.sh.templ diff --git a/patches/systemvm/debian/config/root/redundant_router/checkrouter.sh.templ b/systemvm/patches/debian/config/root/redundant_router/checkrouter.sh.templ similarity index 100% rename from patches/systemvm/debian/config/root/redundant_router/checkrouter.sh.templ rename to systemvm/patches/debian/config/root/redundant_router/checkrouter.sh.templ diff --git a/patches/systemvm/debian/config/root/redundant_router/conntrackd.conf.templ b/systemvm/patches/debian/config/root/redundant_router/conntrackd.conf.templ similarity index 100% rename from patches/systemvm/debian/config/root/redundant_router/conntrackd.conf.templ rename to systemvm/patches/debian/config/root/redundant_router/conntrackd.conf.templ diff --git a/patches/systemvm/debian/config/root/redundant_router/disable_pubip.sh b/systemvm/patches/debian/config/root/redundant_router/disable_pubip.sh similarity index 100% rename from patches/systemvm/debian/config/root/redundant_router/disable_pubip.sh rename to systemvm/patches/debian/config/root/redundant_router/disable_pubip.sh diff --git a/patches/systemvm/debian/config/root/redundant_router/enable_pubip.sh.templ b/systemvm/patches/debian/config/root/redundant_router/enable_pubip.sh.templ similarity index 100% rename from patches/systemvm/debian/config/root/redundant_router/enable_pubip.sh.templ rename to systemvm/patches/debian/config/root/redundant_router/enable_pubip.sh.templ diff --git a/patches/systemvm/debian/config/root/redundant_router/fault.sh.templ b/systemvm/patches/debian/config/root/redundant_router/fault.sh.templ similarity index 100% rename from patches/systemvm/debian/config/root/redundant_router/fault.sh.templ rename to systemvm/patches/debian/config/root/redundant_router/fault.sh.templ diff --git a/patches/systemvm/debian/config/root/redundant_router/heartbeat.sh.templ b/systemvm/patches/debian/config/root/redundant_router/heartbeat.sh.templ similarity index 100% rename from patches/systemvm/debian/config/root/redundant_router/heartbeat.sh.templ rename to systemvm/patches/debian/config/root/redundant_router/heartbeat.sh.templ diff --git a/patches/systemvm/debian/config/root/redundant_router/keepalived.conf.templ b/systemvm/patches/debian/config/root/redundant_router/keepalived.conf.templ similarity index 100% rename from patches/systemvm/debian/config/root/redundant_router/keepalived.conf.templ rename to systemvm/patches/debian/config/root/redundant_router/keepalived.conf.templ diff --git a/patches/systemvm/debian/config/root/redundant_router/master.sh.templ b/systemvm/patches/debian/config/root/redundant_router/master.sh.templ similarity index 100% rename from patches/systemvm/debian/config/root/redundant_router/master.sh.templ rename to systemvm/patches/debian/config/root/redundant_router/master.sh.templ diff --git a/patches/systemvm/debian/config/root/redundant_router/primary-backup.sh.templ b/systemvm/patches/debian/config/root/redundant_router/primary-backup.sh.templ similarity index 100% rename from patches/systemvm/debian/config/root/redundant_router/primary-backup.sh.templ rename to systemvm/patches/debian/config/root/redundant_router/primary-backup.sh.templ diff --git a/patches/systemvm/debian/config/root/redundant_router/services.sh b/systemvm/patches/debian/config/root/redundant_router/services.sh similarity index 100% rename from patches/systemvm/debian/config/root/redundant_router/services.sh rename to systemvm/patches/debian/config/root/redundant_router/services.sh diff --git a/patches/systemvm/debian/config/root/savepassword.sh b/systemvm/patches/debian/config/root/savepassword.sh similarity index 100% rename from patches/systemvm/debian/config/root/savepassword.sh rename to systemvm/patches/debian/config/root/savepassword.sh diff --git a/patches/systemvm/debian/config/root/userdata.py b/systemvm/patches/debian/config/root/userdata.py similarity index 100% rename from patches/systemvm/debian/config/root/userdata.py rename to systemvm/patches/debian/config/root/userdata.py diff --git a/patches/systemvm/debian/config/root/userdata.sh b/systemvm/patches/debian/config/root/userdata.sh similarity index 100% rename from patches/systemvm/debian/config/root/userdata.sh rename to systemvm/patches/debian/config/root/userdata.sh diff --git a/patches/systemvm/debian/config/var/www/html/latest/.htaccess b/systemvm/patches/debian/config/var/www/html/latest/.htaccess similarity index 100% rename from patches/systemvm/debian/config/var/www/html/latest/.htaccess rename to systemvm/patches/debian/config/var/www/html/latest/.htaccess diff --git a/patches/systemvm/debian/config/var/www/html/userdata/.htaccess b/systemvm/patches/debian/config/var/www/html/userdata/.htaccess similarity index 100% rename from patches/systemvm/debian/config/var/www/html/userdata/.htaccess rename to systemvm/patches/debian/config/var/www/html/userdata/.htaccess diff --git a/patches/systemvm/debian/convert.sh b/systemvm/patches/debian/convert.sh similarity index 100% rename from patches/systemvm/debian/convert.sh rename to systemvm/patches/debian/convert.sh diff --git a/patches/systemvm/debian/qemuconvert.sh b/systemvm/patches/debian/qemuconvert.sh similarity index 100% rename from patches/systemvm/debian/qemuconvert.sh rename to systemvm/patches/debian/qemuconvert.sh diff --git a/patches/systemvm/debian/systemvm.vmx b/systemvm/patches/debian/systemvm.vmx similarity index 100% rename from patches/systemvm/debian/systemvm.vmx rename to systemvm/patches/debian/systemvm.vmx diff --git a/patches/systemvm/debian/systemvm.xml b/systemvm/patches/debian/systemvm.xml similarity index 100% rename from patches/systemvm/debian/systemvm.xml rename to systemvm/patches/debian/systemvm.xml diff --git a/patches/systemvm/debian/vhdconvert.sh b/systemvm/patches/debian/vhdconvert.sh similarity index 100% rename from patches/systemvm/debian/vhdconvert.sh rename to systemvm/patches/debian/vhdconvert.sh diff --git a/patches/systemvm/debian/vpn/etc/ipsec.conf b/systemvm/patches/debian/vpn/etc/ipsec.conf similarity index 100% rename from patches/systemvm/debian/vpn/etc/ipsec.conf rename to systemvm/patches/debian/vpn/etc/ipsec.conf diff --git a/patches/systemvm/debian/vpn/etc/ipsec.d/l2tp.conf b/systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf similarity index 100% rename from patches/systemvm/debian/vpn/etc/ipsec.d/l2tp.conf rename to systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf diff --git a/patches/systemvm/debian/vpn/etc/ipsec.secrets b/systemvm/patches/debian/vpn/etc/ipsec.secrets similarity index 100% rename from patches/systemvm/debian/vpn/etc/ipsec.secrets rename to systemvm/patches/debian/vpn/etc/ipsec.secrets diff --git a/patches/systemvm/debian/vpn/etc/ppp/options.xl2tpd b/systemvm/patches/debian/vpn/etc/ppp/options.xl2tpd similarity index 100% rename from patches/systemvm/debian/vpn/etc/ppp/options.xl2tpd rename to systemvm/patches/debian/vpn/etc/ppp/options.xl2tpd diff --git a/patches/systemvm/debian/vpn/etc/xl2tpd/xl2tpd.conf b/systemvm/patches/debian/vpn/etc/xl2tpd/xl2tpd.conf similarity index 100% rename from patches/systemvm/debian/vpn/etc/xl2tpd/xl2tpd.conf rename to systemvm/patches/debian/vpn/etc/xl2tpd/xl2tpd.conf diff --git a/patches/systemvm/debian/vpn/opt/cloud/bin/vpc_vpn_l2tp.sh b/systemvm/patches/debian/vpn/opt/cloud/bin/vpc_vpn_l2tp.sh similarity index 100% rename from patches/systemvm/debian/vpn/opt/cloud/bin/vpc_vpn_l2tp.sh rename to systemvm/patches/debian/vpn/opt/cloud/bin/vpc_vpn_l2tp.sh diff --git a/patches/systemvm/debian/vpn/opt/cloud/bin/vpn_l2tp.sh b/systemvm/patches/debian/vpn/opt/cloud/bin/vpn_l2tp.sh similarity index 100% rename from patches/systemvm/debian/vpn/opt/cloud/bin/vpn_l2tp.sh rename to systemvm/patches/debian/vpn/opt/cloud/bin/vpn_l2tp.sh diff --git a/patches/systemvm/debian/xe/xe-daemon b/systemvm/patches/debian/xe/xe-daemon similarity index 100% rename from patches/systemvm/debian/xe/xe-daemon rename to systemvm/patches/debian/xe/xe-daemon diff --git a/patches/systemvm/debian/xe/xe-linux-distribution b/systemvm/patches/debian/xe/xe-linux-distribution similarity index 100% rename from patches/systemvm/debian/xe/xe-linux-distribution rename to systemvm/patches/debian/xe/xe-linux-distribution diff --git a/patches/systemvm/debian/xe/xe-update-guest-attrs b/systemvm/patches/debian/xe/xe-update-guest-attrs similarity index 100% rename from patches/systemvm/debian/xe/xe-update-guest-attrs rename to systemvm/patches/debian/xe/xe-update-guest-attrs diff --git a/systemvm/pom.xml b/systemvm/pom.xml new file mode 100644 index 00000000000..5f352177362 --- /dev/null +++ b/systemvm/pom.xml @@ -0,0 +1,260 @@ + + + 4.0.0 + cloud-systemvm + Apache CloudStack System VM + pom + + org.apache.cloudstack + cloudstack + 4.3.0-SNAPSHOT + ../pom.xml + + + mkisofs + + + + org.apache.cloudstack + cloud-agent + ${project.version} + + + org.apache.cloudstack + cloud-secondary-storage + ${project.version} + + + org.apache.cloudstack + cloud-console-proxy + ${project.version} + + + + + + maven-assembly-plugin + 2.3 + + systemvm + false + + systemvm-descriptor.xml + + + + + make-systemvm + package + + single + + + + + + maven-resources-plugin + 2.6 + + + copy-resources + + package + + copy-resources + + + dist + + + target + + systemvm.zip + + + + patches/debian/config/root/.ssh + + authorized_keys + + + + + + + + + maven-antrun-plugin + 1.7 + + + build-cloud-scripts + generate-sources + + run + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + package + + exec + + + + + ${mkisofs} + dist + + -quiet + -r + -o + systemvm.iso + systemvm.zip + cloud-scripts.tgz + authorized_keys + + + + + + + + + genisoimage + + + /usr/bin/genisoimage + + + + genisoimage + + + + vmware + + + nonoss + + + + + org.apache.cloudstack + cloud-plugin-hypervisor-vmware + ${project.version} + + + org.apache.cloudstack + cloud-vmware-base + ${project.version} + + + + + quickcloud + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + + java + + + + + com.cloud.agent.AgentShell + + zone=1 + pod=1 + host=192.168.56.1 + guid=ConsoleProxy.1 + + + + javax.net.ssl.trustStore + certs/realhostip.keystore + log.home + ${PWD}/ + + + + + + + + + + diff --git a/services/console-proxy/server/scripts/_run.sh b/systemvm/scripts/_run.sh similarity index 100% rename from services/console-proxy/server/scripts/_run.sh rename to systemvm/scripts/_run.sh diff --git a/services/console-proxy/server/scripts/config_auth.sh b/systemvm/scripts/config_auth.sh similarity index 100% rename from services/console-proxy/server/scripts/config_auth.sh rename to systemvm/scripts/config_auth.sh diff --git a/services/console-proxy/server/scripts/config_ssl.sh b/systemvm/scripts/config_ssl.sh similarity index 100% rename from services/console-proxy/server/scripts/config_ssl.sh rename to systemvm/scripts/config_ssl.sh diff --git a/services/console-proxy/server/scripts/consoleproxy.sh b/systemvm/scripts/consoleproxy.sh similarity index 100% rename from services/console-proxy/server/scripts/consoleproxy.sh rename to systemvm/scripts/consoleproxy.sh diff --git a/services/console-proxy/server/scripts/ipfirewall.sh b/systemvm/scripts/ipfirewall.sh similarity index 100% rename from services/console-proxy/server/scripts/ipfirewall.sh rename to systemvm/scripts/ipfirewall.sh diff --git a/services/console-proxy/server/scripts/run-proxy.sh b/systemvm/scripts/run-proxy.sh similarity index 100% rename from services/console-proxy/server/scripts/run-proxy.sh rename to systemvm/scripts/run-proxy.sh diff --git a/services/console-proxy/server/scripts/run.bat b/systemvm/scripts/run.bat similarity index 100% rename from services/console-proxy/server/scripts/run.bat rename to systemvm/scripts/run.bat diff --git a/services/console-proxy/server/scripts/run.sh b/systemvm/scripts/run.sh similarity index 100% rename from services/console-proxy/server/scripts/run.sh rename to systemvm/scripts/run.sh diff --git a/services/console-proxy/server/scripts/secstorage.sh b/systemvm/scripts/secstorage.sh similarity index 100% rename from services/console-proxy/server/scripts/secstorage.sh rename to systemvm/scripts/secstorage.sh diff --git a/services/console-proxy/server/systemvm-descriptor.xml b/systemvm/systemvm-descriptor.xml similarity index 91% rename from services/console-proxy/server/systemvm-descriptor.xml rename to systemvm/systemvm-descriptor.xml index 6c98d2d3eb0..2eb4abc2245 100644 --- a/services/console-proxy/server/systemvm-descriptor.xml +++ b/systemvm/systemvm-descriptor.xml @@ -31,13 +31,13 @@ - ../../../scripts/storage/secondary/ + ../scripts/storage/secondary/ scripts/storage/secondary 555 555 - ../../secondary-storage/scripts/ + ../services/secondary-storage/scripts/ 555 555 @@ -45,12 +45,6 @@ ssvm-check.sh - - ../../../scripts/storage/secondary/ - scripts/storage/secondary - 555 - 555 - scripts diff --git a/services/console-proxy/server/ui/viewer-bad-sid.ftl b/systemvm/ui/viewer-bad-sid.ftl similarity index 100% rename from services/console-proxy/server/ui/viewer-bad-sid.ftl rename to systemvm/ui/viewer-bad-sid.ftl diff --git a/services/console-proxy/server/ui/viewer-connect-failed.ftl b/systemvm/ui/viewer-connect-failed.ftl similarity index 100% rename from services/console-proxy/server/ui/viewer-connect-failed.ftl rename to systemvm/ui/viewer-connect-failed.ftl diff --git a/services/console-proxy/server/ui/viewer-update.ftl b/systemvm/ui/viewer-update.ftl similarity index 100% rename from services/console-proxy/server/ui/viewer-update.ftl rename to systemvm/ui/viewer-update.ftl diff --git a/services/console-proxy/server/ui/viewer.ftl b/systemvm/ui/viewer.ftl similarity index 100% rename from services/console-proxy/server/ui/viewer.ftl rename to systemvm/ui/viewer.ftl diff --git a/services/console-proxy/server/vm-script/vmops b/systemvm/vm-script/vmops similarity index 100% rename from services/console-proxy/server/vm-script/vmops rename to systemvm/vm-script/vmops