summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2019-11-27 10:57:22 +0100
committerSimon Rettberg2019-11-27 10:57:22 +0100
commit04dabbf943aae7e5327278b23d4cfcbb7ac5fbe8 (patch)
treedeeaa65c570ca1a841eb5f2b08aec65304bdaadc
parent[SSPS] Add wakeonlan (diff)
downloadsetup-scripts-04dabbf943aae7e5327278b23d4cfcbb7ac5fbe8.tar.gz
setup-scripts-04dabbf943aae7e5327278b23d4cfcbb7ac5fbe8.tar.xz
setup-scripts-04dabbf943aae7e5327278b23d4cfcbb7ac5fbe8.zip
[SSPS/SSUS] Add js_ip to slx-admin
-rw-r--r--satellit_installer/includes/00-variables.inc2
-rw-r--r--satellit_upgrader/updater.template.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/satellit_installer/includes/00-variables.inc b/satellit_installer/includes/00-variables.inc
index aff26fd..780b975 100644
--- a/satellit_installer/includes/00-variables.inc
+++ b/satellit_installer/includes/00-variables.inc
@@ -44,5 +44,5 @@ SLXADMIN_MODULES="adduser backup baseconfig baseconfig_bwidm baseconfig_bwlp boo
SLXADMIN_MODULES+=" bootstrap_multiselect bootstrap_switch dnbd3 dozmod eventlog exams js_chart js_circles js_jqueryui js_moment"
SLXADMIN_MODULES+=" js_selectize js_stupidtable js_vis js_weekcalendar locationinfo locations main minilinux news permissionmanager"
SLXADMIN_MODULES+=" serversetup-bwlp-ipxe rebootcontrol roomplanner runmode session statistics statistics_reporting summernote sysconfig"
-SLXADMIN_MODULES+=" syslog systemstatus vmstore webinterface"
+SLXADMIN_MODULES+=" syslog systemstatus vmstore webinterface js_ip"
diff --git a/satellit_upgrader/updater.template.sh b/satellit_upgrader/updater.template.sh
index d898f34..4347bed 100644
--- a/satellit_upgrader/updater.template.sh
+++ b/satellit_upgrader/updater.template.sh
@@ -395,7 +395,7 @@ if [ -n "$TGZ_SLXADMIN" ]; then
mkdir -p "$PATH_SLXADMIN/modules"
cd "$PATH_SLXADMIN/modules" || perror "Cannot cd to slxadmin"
echo "Enabling slx-admin modules"
- for mod in adduser backup baseconfig baseconfig_bwidm baseconfig_bwlp bootstrap_datepicker bootstrap_dialog bootstrap_multiselect bootstrap_switch bootstrap_timepicker dnbd3 dozmod eventlog exams js_chart js_circles js_jqueryui js_moment js_selectize js_stupidtable js_vis js_weekcalendar locationinfo locations main minilinux news permissionmanager rebootcontrol roomplanner runmode "$bootmodule" session statistics statistics_reporting summernote sysconfig syslog systemstatus vmstore webinterface; do
+ for mod in adduser backup baseconfig baseconfig_bwidm baseconfig_bwlp bootstrap_datepicker bootstrap_dialog bootstrap_multiselect bootstrap_switch bootstrap_timepicker dnbd3 dozmod eventlog exams js_chart js_circles js_jqueryui js_moment js_selectize js_stupidtable js_vis js_weekcalendar locationinfo locations main minilinux news permissionmanager rebootcontrol roomplanner runmode "$bootmodule" session statistics statistics_reporting summernote sysconfig syslog systemstatus vmstore webinterface js_ip; do
name=${mod%%-*}
rm -f -- "$name"
ln -s "../modules-available/$mod" "$name" || pwarning "Could not activate module '$mod' (alias '$name')"