diff --git a/dd-ctl b/dd-ctl index 2d03292..1f34039 100755 --- a/dd-ctl +++ b/dd-ctl @@ -548,72 +548,78 @@ upgrade_plugins_moodle(){ mkdir -p /tmp/moodle/theme/cbe mkdir -p /tmp/moodle/blocks - curl --location $MOODLE_PLUGIN_JITSI > jitsi.zip + curl --location "${MOODLE_PLUGIN_JITSI_OVERRIDE:-https://moodle.org/plugins/download.php/27002/mod_jitsi_moodle40_2022070602.zip}" > jitsi.zip unzip jitsi.zip -d /tmp/moodle/mod/ rm jitsi.zip - curl --location $MOODLE_PLUGIN_BBB > bbb.zip + curl --location "${MOODLE_PLUGIN_BBB_OVERRIDE:-https://moodle.org/plugins/download.php/26792/mod_bigbluebuttonbn_moodle311_2019101014.zip}" > bbb.zip unzip bbb.zip -d /tmp/moodle/mod/ rm bbb.zip # curl --location https://github.com/isard-vdi/moodle-auth_saml2/archive/refs/heads/role_map.zip > auth_saml2.zip # curl --location https://moodle.org/plugins/download.php/24556/auth_saml2_moodle311_2021062900.zip > auth_saml2.zip - curl --location $MOODLE_PLUGIN_SAML > auth_saml2.zip + curl --location "${MOODLE_PLUGIN_SAML_OVERRIDE:-https://github.com/isard-vdi/moodle-auth_saml2/archive/refs/heads/role_map.zip}" > auth_saml2.zip unzip auth_saml2.zip -d /tmp/moodle/auth/ mv /tmp/moodle/auth/moodle-auth_saml2-role_map/* /tmp/moodle/auth/saml2/ rm -rf /tmp/moodle/auth/moodle-auth_saml2-role_map rm auth_saml2.zip + M3IPSHARE="https://github.com/3iPunt/moodle_mod_tresipuntshare/archive/refs/heads/master.zip" - if [[ "$MOODLE_PLUGIN_TRESIPUNTSHARE" == *"develop"* ]]; then + if [[ "${MOODLE_PLUGIN_TRESIPUNTSHARE_OVERRIDE:-${M3IPSHARE}}" == *"develop"* ]]; then PLUGIN_BRANCH=develop else PLUGIN_BRANCH=master fi - curl --location $MOODLE_PLUGIN_TRESIPUNTSHARE > tresipuntshare.zip + curl --location "${MOODLE_PLUGIN_TRESIPUNTSHARE_OVERRIDE:-${M3IPSHARE}}" > tresipuntshare.zip unzip tresipuntshare.zip -d /tmp/moodle/mod/ mv /tmp/moodle/mod/moodle_mod_tresipuntshare-$PLUGIN_BRANCH /tmp/moodle/mod/tresipuntshare rm tresipuntshare.zip + M3IPVIDEO="https://github.com/3iPunt/moodle_mod_tresipuntvideo/archive/refs/heads/master.zip" - if [[ "$MOODLE_PLUGIN_TRESIPUNTVIDEO" == *"develop"* ]]; then + if [[ "${MOODLE_PLUGIN_TRESIPUNTVIDEO_OVERRIDE:-${M3IPVIDEO}}" == *"develop"* ]]; then PLUGIN_BRANCH=develop else PLUGIN_BRANCH=master fi - curl --location $MOODLE_PLUGIN_TRESIPUNTVIDEO > tresipuntvideo.zip + curl --location "${MOODLE_PLUGIN_TRESIPUNTVIDEO_OVERRIDE:-${M3IPVIDEO}}" > tresipuntvideo.zip unzip tresipuntvideo.zip -d /tmp/moodle/mod/ mv /tmp/moodle/mod/moodle_mod_tresipuntvideo-$PLUGIN_BRANCH /tmp/moodle/mod/tresipuntvideo rm tresipuntvideo.zip + M3IPAUDIO="https://github.com/3iPunt/moodle_mod_tresipuntaudio/archive/refs/heads/master.zip" - if [[ "$MOODLE_PLUGIN_TRESIPUNTAUDIO" == *"develop"* ]]; then + if [[ "${MOODLE_PLUGIN_TRESIPUNTAUDIO_OVERRIDE:-${M3IPAUDIO}}" == *"develop"* ]]; then PLUGIN_BRANCH=develop else PLUGIN_BRANCH=master fi - curl --location $MOODLE_PLUGIN_TRESIPUNTAUDIO > tresipuntaudio.zip + curl --location "${MOODLE_PLUGIN_TRESIPUNTAUDIO_OVERRIDE:-${M3IPAUDIO}}" > tresipuntaudio.zip unzip tresipuntaudio.zip -d /tmp/moodle/mod/ mv /tmp/moodle/mod/moodle_mod_tresipuntaudio-$PLUGIN_BRANCH /tmp/moodle/mod/tresipuntaudio rm tresipuntaudio.zip + M3IPSUBMISSION="https://github.com/3iPunt/moodle_assignsubmission_tipnc/archive/refs/heads/master.zip" - if [[ "$MOODLE_PLUGIN_ASSIGNSUBMISSION" == *"develop"* ]]; then + if [[ "${MOODLE_PLUGIN_ASSIGNSUBMISSION_OVERRIDE:-${M3IPSUBMISSION}}" == *"develop"* ]]; then PLUGIN_BRANCH=develop else PLUGIN_BRANCH=master fi - curl --location $MOODLE_PLUGIN_ASSIGNSUBMISSION > assignsubmission_tipnc.zip + curl --location "${MOODLE_PLUGIN_ASSIGNSUBMISSION_OVERRIDE:-${M3IPSUBMISSION}}" > assignsubmission_tipnc.zip unzip assignsubmission_tipnc.zip -d /tmp/moodle/mod/assign/submission/ mv /tmp/moodle/mod/assign/submission/moodle_assignsubmission_tipnc-$PLUGIN_BRANCH /tmp/moodle/mod/assign/submission/tipnc rm assignsubmission_tipnc.zip + M3IPSPEND="https://github.com/3iPunt/moodle_block_tresipuntmodspend/archive/refs/heads/master.zip" - curl --location $MOODLE_PLUGIN_TRESIPUNTMODSPEND > block_tresipuntmodspend.zip + curl --location "${MOODLE_PLUGIN_TRESIPUNTMODSPEND_OVERRIDE:-${M3IPSPEND}}" > block_tresipuntmodspend.zip unzip block_tresipuntmodspend.zip -d /tmp/moodle/blocks/ rm block_tresipuntmodspend.zip + M3IPCBE="https://github.com/3iPunt/moodle_theme_cbe/archive/refs/heads/master.zip" - if [[ "$MOODLE_THEME_CBE" == *"develop"* ]]; then + if [[ "${MOODLE_THEME_CBE_OVERRIDE:-${M3IPCBE}}" == *"develop"* ]]; then PLUGIN_BRANCH=develop else PLUGIN_BRANCH=master fi - curl --location $MOODLE_THEME_CBE > tresipunt_theme_cbe.zip + curl --location "${MOODLE_THEME_CBE_OVERRIDE:-${M3IPCBE}}" > tresipunt_theme_cbe.zip unzip tresipunt_theme_cbe.zip -d /tmp/moodle/theme/cbe/ mv /tmp/moodle/theme/cbe/moodle_theme_cbe-$PLUGIN_BRANCH/* /tmp/moodle/theme/cbe/ rm tresipunt_theme_cbe.zip diff --git a/dd.conf.sample b/dd.conf.sample index 4924d23..e44e10a 100644 --- a/dd.conf.sample +++ b/dd.conf.sample @@ -149,16 +149,6 @@ MOODLE_MAX_FILESIZE_UPLOAD=200M MOODLE_MAX_EXECUTION_TIME=300 MOODLE_MEMORY_LIMIT=128M -MOODLE_PLUGIN_JITSI=https://moodle.org/plugins/download.php/27002/mod_jitsi_moodle40_2022070602.zip -MOODLE_PLUGIN_BBB=https://moodle.org/plugins/download.php/26792/mod_bigbluebuttonbn_moodle311_2019101014.zip -MOODLE_PLUGIN_SAML=https://github.com/isard-vdi/moodle-auth_saml2/archive/refs/heads/role_map.zip -MOODLE_PLUGIN_TRESIPUNTSHARE=https://github.com/3iPunt/moodle_mod_tresipuntshare/archive/refs/heads/master.zip -MOODLE_PLUGIN_TRESIPUNTVIDEO=https://github.com/3iPunt/moodle_mod_tresipuntvideo/archive/refs/heads/master.zip -MOODLE_PLUGIN_TRESIPUNTAUDIO=https://github.com/3iPunt/moodle_mod_tresipuntaudio/archive/refs/heads/master.zip -MOODLE_PLUGIN_ASSIGNSUBMISSION=https://github.com/3iPunt/moodle_assignsubmission_tipnc/archive/refs/heads/master.zip -MOODLE_PLUGIN_TRESIPUNTMODSPEND=https://gitlab.com/DD-workspace/DD/-/raw/main/custom.sample/moodle/plugins/block_tresipuntmodspend.zip?inline=false -MOODLE_THEME_CBE=https://github.com/3iPunt/moodle_theme_cbe/archive/refs/heads/master.zip - ## NEXTCLOUD NEXTCLOUD_IMG=nextcloud:21.0.5-fpm-alpine