shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-04-01 06:50:25 +03:00
Code Releases Wiki Activity

F #3951: Several changes to install.sh

Browse Source 
* Adjust oneprovision template routes to avoid duplicity on
reinstallation
* Remove guacamole from Sunstone install
* Add fireedge etc as conf files
This commit is contained in:
Tino Vazquez 2021-02-02 12:49:40 +01:00
parent 7a2fb391c0
commit df5c10c91a
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
install.sh
View File

@ -745,7 +745,7 @@ INSTALL_ONEPROVISION_FILES=(
ONEPROVISION_ONE_LIB_FILES:$LIB_LOCATION/ruby/cli/one_helper
ONEPROVISION_CONF_FILES:$ETC_LOCATION/cli
ONEPROVISION_ANSIBLE_FILES:$SHARE_LOCATION/oneprovision
ONEPROVISION_TEMPLATES_FILES:$SHARE_LOCATION/oneprovision/provisions
ONEPROVISION_TEMPLATES_FILES:$SHARE_LOCATION/oneprovision
ONEPROVISION_LIB_FILES:$LIB_LOCATION/oneprovision/lib
ONEPROVISION_LIB_TF_FILES:$LIB_LOCATION/oneprovision/lib/terraform
ONEPROVISION_LIB_PROVIDERS_FILES:$LIB_LOCATION/oneprovision/lib/terraform/providers
@ -791,7 +791,6 @@ INSTALL_SUNSTONE_FILES=(
INSTALL_SUNSTONE_PUBLIC_MINIFIED_FILES=(
SUNSTONE_PUBLIC_JS_FILES:$SUNSTONE_LOCATION/public/dist
SUNSTONE_PUBLIC_JS_GUAC_FILES:$SUNSTONE_LOCATION/guac/dist
SUNSTONE_PUBLIC_JS_CONSOLE_FILES:$SUNSTONE_LOCATION/public/dist/console
SUNSTONE_PUBLIC_FONT_AWSOME:$SUNSTONE_LOCATION/public/bower_components/fontawesome/web-fonts-with-css/webfonts
SUNSTONE_PUBLIC_CSS_FILES:$SUNSTONE_LOCATION/public/css
@ -820,7 +819,6 @@ INSTALL_SUNSTONE_PUBLIC_MINIFIED_FILES=(
INSTALL_SUNSTONE_PUBLIC_DEV_DIR=(
SUNSTONE_PUBLIC_DEV_DIR:$SUNSTONE_LOCATION
SUNSTONE_GUAC_DEV_DIR:$SUNSTONE_LOCATION
)
INSTALL_SUNSTONE_ETC_FILES=(
@ -833,9 +831,12 @@ INSTALL_SUNSTONE_ETC_FILES=(
INSTALL_FIREEDGE_FILES=(
FIREEDGE_MINIFIED_FILES:$FIREEDGE_LOCATION
FIREEDGE_BIN_FILES:$BIN_LOCATION
FIREEDGE_ETC_FILES:$ETC_LOCATION
)
INSTALL_FIREEDGE_ETC_FILES=(
FIREEDGE_ETC_FILES:$ETC_LOCATION
)
INSTALL_FIREEDGE_DEV_DIRS=(
FIREEDGE_DEV_FILES:$FIREEDGE_LOCATION
)
@ -2520,8 +2521,6 @@ SUNSTONE_PUBLIC_JS_FILES="src/sunstone/public/dist/login.js \
SUNSTONE_PUBLIC_JS_GUAC_FILES="src/sunstone/guac/dist/guac.js"
SUNSTONE_GUAC_DEV_DIR="src/sunstone/guac"
SUNSTONE_PUBLIC_JS_CONSOLE_FILES="src/sunstone/public/dist/console/vnc.js \
src/sunstone/public/dist/console/vnc.js.map \
src/sunstone/public/dist/console/spice.js \
@ -3009,6 +3008,8 @@ done
if [ "$INSTALL_ETC" = "yes" ] ; then
if [ "$SUNSTONE" = "yes" ]; then
INSTALL_ETC_SET="${INSTALL_SUNSTONE_ETC_FILES[@]}"
elif [ "$FIREEDGE" = "yes" ]; then
INSTALL_ETC_SET="${INSTALL_FIREDGE_ETC_FILES[@]}"
elif [ "$ONEGATE" = "yes" ]; then
INSTALL_ETC_SET="${INSTALL_ONEGATE_ETC_FILES[@]}"
elif [ "$ONEFLOW" = "yes" ]; then
@ -3016,6 +3017,7 @@ if [ "$INSTALL_ETC" = "yes" ] ; then
else
INSTALL_ETC_SET="${INSTALL_ETC_FILES[@]} \
${INSTALL_SUNSTONE_ETC_FILES[@]} \
${INSTALL_FIREEDGE_ETC_FILES[@]} \
${INSTALL_ONEGATE_ETC_FILES[@]} \
${INSTALL_ONEHEM_ETC_FILES[@]} \
${INSTALL_ONEFLOW_ETC_FILES[@]}"