diff options
| author | Jonathan Bauer | 2018-12-12 14:27:04 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2018-12-12 14:27:04 +0100 |
| commit | 227dc993f09592b57320130a0d6231fc2b60550b (patch) | |
| tree | 4dc9057f7d5be4d02c28197725a39c7cd4ba2d9b /core/modules/run-virt/data/opt/openslx/vmchooser/scripts | |
| parent | [vmchooser] respect new urls params from resource_urls.conf (diff) | |
| download | mltk-227dc993f09592b57320130a0d6231fc2b60550b.tar.gz mltk-227dc993f09592b57320130a0d6231fc2b60550b.tar.xz mltk-227dc993f09592b57320130a0d6231fc2b60550b.zip | |
[run-virt] rework resource management
Diffstat (limited to 'core/modules/run-virt/data/opt/openslx/vmchooser/scripts')
| -rw-r--r-- | core/modules/run-virt/data/opt/openslx/vmchooser/scripts/set-firewall | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/scripts/set-firewall b/core/modules/run-virt/data/opt/openslx/vmchooser/scripts/set-firewall index 2773150c..01c7472c 100644 --- a/core/modules/run-virt/data/opt/openslx/vmchooser/scripts/set-firewall +++ b/core/modules/run-virt/data/opt/openslx/vmchooser/scripts/set-firewall @@ -65,7 +65,12 @@ fi sort -u "${AUTORULES}" > "${RULES}" -wget -T 6 -O - "${SLX_VMCHOOSER_BASE_URL}/lecture/$1/netrules" >> "${RULES}" 2> "${AUTORULES}" +# determine the URL to download the netrules from +. /opt/openslx/vmchooser/config/resource_urls.conf +NETRULES_URL= +[ -n "$url_lecture_netrules" ] && NETRULES_URL="${url_lecture_netrules//%UUID%/${1}}" +[ -z "$NETRULES_URL" ] && NETRULES_URL="${SLX_VMCHOOSER_BASE_URL}/lecture/$1/netrules" +wget -T 6 -O - "${NETRULES_URL}" >> "${RULES}" 2> "${AUTORULES}" RET=$? if [ "$RET" != "0" ]; then |