From 48289e2b29739f757221109964937029103c427f Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Fri, 19 Jan 2018 13:24:16 +0100 Subject: [PATCH] Revert "Revert "F #5241: Updated install.sh (#568)"" This reverts commit 70ce299caae6abc9580ca7d13fcd8ae62c1032a6. --- install.sh | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) mode change 100755 => 100644 install.sh diff --git a/install.sh b/install.sh old mode 100755 new mode 100644 index d549afeb3c..352ba81fc5 --- a/install.sh +++ b/install.sh @@ -221,7 +221,10 @@ ETC_DIRS="$ETC_LOCATION/vmm_exec \ $ETC_LOCATION/auth/certificates \ $ETC_LOCATION/ec2query_templates \ $ETC_LOCATION/sunstone-views \ - $ETC_LOCATION/cli" + $ETC_LOCATION/cli \ + $ETC_LOCATION/sunstone-views/kvm \ + $ETC_LOCATION/sunstone-views/vcenter \ + $ETC_LOCATION/sunstone-views/mixed" LIB_DIRS="$LIB_LOCATION/ruby \ $LIB_LOCATION/ruby/opennebula \ @@ -512,7 +515,9 @@ INSTALL_SUNSTONE_PUBLIC_DEV_DIR=( INSTALL_SUNSTONE_ETC_FILES=( SUNSTONE_ETC_FILES:$ETC_LOCATION - SUNSTONE_ETC_VIEW_FILES:$ETC_LOCATION/sunstone-views + SUNSTONE_ETC_VIEW_KVM:$ETC_LOCATION/sunstone-views/kvm + SUNSTONE_ETC_VIEW_VCENTER:$ETC_LOCATION/sunstone-views/vcenter + SUNSTONE_ETC_VIEW_MIXED:$ETC_LOCATION/sunstone-views/mixed ) INSTALL_ONEGATE_FILES=( @@ -1598,13 +1603,20 @@ SUNSTONE_ETC_FILES="src/sunstone/etc/sunstone-server.conf \ src/sunstone/etc/sunstone-views.yaml \ src/sunstone/etc/sunstone-logos.yaml" -SUNSTONE_ETC_VIEW_FILES="src/sunstone/etc/sunstone-views/admin.yaml \ - src/sunstone/etc/sunstone-views/user.yaml \ - src/sunstone/etc/sunstone-views/cloud.yaml \ - src/sunstone/etc/sunstone-views/cloud_vcenter.yaml \ - src/sunstone/etc/sunstone-views/groupadmin.yaml \ - src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml \ - src/sunstone/etc/sunstone-views/admin_vcenter.yaml" +SUNSTONE_ETC_VIEW_KVM="src/sunstone/etc/sunstone-views/kvm/admin.yaml \ + src/sunstone/etc/sunstone-views/kvm/user.yaml \ + src/sunstone/etc/sunstone-views/kvm/cloud.yaml \ + src/sunstone/etc/sunstone-views/kvm/groupadmin.yaml" + +SUNSTONE_ETC_VIEW_VCENTER="src/sunstone/etc/sunstone-views/vcenter/admin.yaml \ + src/sunstone/etc/sunstone-views/vcenter/user.yaml \ + src/sunstone/etc/sunstone-views/vcenter/cloud.yaml \ + src/sunstone/etc/sunstone-views/vcenter/groupadmin.yaml" + +SUNSTONE_ETC_VIEW_MIXED="src/sunstone/etc/sunstone-views/mixed/admin.yaml \ + src/sunstone/etc/sunstone-views/mixed/user.yaml \ + src/sunstone/etc/sunstone-views/mixed/cloud.yaml \ + src/sunstone/etc/sunstone-views/mixed/groupadmin.yaml" SUNSTONE_MODELS_FILES="src/sunstone/models/OpenNebulaJSON.rb \ src/sunstone/models/SunstoneServer.rb \