From b296cc06fc0933912009c93de0b9bda4ef4829a8 Mon Sep 17 00:00:00 2001 From: darta Date: Sat, 7 May 2022 13:54:21 +0200 Subject: [PATCH] fix(dd-ctl): copy saml plugins from src folders to fix versions --- dd-ctl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dd-ctl b/dd-ctl index 4ed100f..d52ee6d 100755 --- a/dd-ctl +++ b/dd-ctl @@ -182,7 +182,7 @@ setup_nextcloud(){ docker exec -u www-data isard-apps-nextcloud-app php occ app:install mail docker exec -u www-data isard-apps-nextcloud-app php occ app:enable mail - docker exec -u www-data isard-apps-nextcloud-app php occ app:install user_saml + #docker exec -u www-data isard-apps-nextcloud-app php occ app:install user_saml docker exec -u www-data isard-apps-nextcloud-app php occ app:enable user_saml docker exec -u www-data isard-apps-nextcloud-app php occ app:install ownpad docker exec isard-apps-nextcloud-app apk add jq @@ -258,7 +258,8 @@ setup_wordpress(){ #docker exec -ti isard-apps-wordpress /bin/sh -c "if [ ! -d /var/www/html/wp-content/plugins/saml/onelogin-saml-sso ]; then cp -R /plugins/saml/onelogin-saml-sso /var/www/html/wp-content/plugins/; fi" # docker exec -ti isard-apps-wordpress /bin/sh -c "if [ ! -d /var/www/html/wp-content/mu-plugins ]; then cp -R /plugins/mu-plugins /var/www/html/wp-content/; fi" - docker-compose run --user=33 isard-apps-wordpress-cli /bin/bash -c 'wp plugin install onelogin-saml-sso --activate' + # docker-compose run --user=33 isard-apps-wordpress-cli /bin/bash -c 'wp plugin install onelogin-saml-sso --activate' + docker-compose run --user=33 isard-apps-wordpress-cli /bin/bash -c 'wp plugin activate onelogin-saml-sso' # cp -R isard-apps/docker/nextcloud/onelogin-saml-sso $SRC_FOLDER/wordpress/wp-content/plugins/ # docker-compose run --user=33 isard-apps-wordpress-cli /bin/bash -c 'wp plugin activate onelogin-saml-sso' docker-compose run --user=33 isard-apps-wordpress-cli /bin/bash -c 'wp plugin install generateblocks --activate' @@ -437,10 +438,12 @@ upgrade_plugins_moodle(){ } upgrade_plugins_nextcloud(){ - cp -R isard-apps/docker/nextcloud/themes/* $SRC_FOLDER/nextcloud/themes/ + cp -R isard-apps/docker/nextcloud/src/* $SRC_FOLDER/nextcloud/ } upgrade_plugins_wp(){ + cp -R isard-apps/docker/wordpress/src/* $SRC_FOLDER/wordpress/ + if [ ! -d $SRC_FOLDER/wordpress/wp-content/mu-plugins ]; then git clone https://gitlab.com/muplugins-multiste1/muplugins-google-sites.git $SRC_FOLDER/wordpress/wp-content/mu-plugins fi