diff --git a/dd-ctl b/dd-ctl index 0d5b815..c2051ba 100755 --- a/dd-ctl +++ b/dd-ctl @@ -149,7 +149,7 @@ setup_nextcloud(){ docker exec -u www-data isard-apps-nextcloud-app php occ --no-warnings app:disable recommendations # Add bruteforcesettings app. This host docker network should be added at this plugins settings through nextcloud ddadmin web ui. - docker exec -ti isard-apps-nextcloud-app /bin/sh -c "su - www-data -s /bin/sh -c 'PHP_MEMORY_LIMIT=512M php /var/www/html/occ app:install bruteforcesettings'" + docker exec -u www-data isard-apps-nextcloud-app php occ app:install bruteforcesettings # Custom forms docker exec isard-apps-nextcloud-app apk add git npm composer @@ -178,19 +178,19 @@ setup_nextcloud(){ docker exec -u www-data isard-apps-nextcloud-app php occ --no-warnings config:system:set theme --value=digitaldemocratic docker exec -u www-data isard-apps-nextcloud-app php occ --no-warnings config:system:set allow_local_remote_servers --value=true docker exec -u www-data isard-apps-nextcloud-app php occ --no-warnings maintenance:theme:update - docker exec -ti isard-apps-nextcloud-app /bin/sh -c "su - www-data -s /bin/sh -c 'PHP_MEMORY_LIMIT=512M php /var/www/html/occ app:disable dashboard'" + docker exec -u www-data isard-apps-nextcloud-app php occ app:disable dashboard - docker exec -ti isard-apps-nextcloud-app /bin/sh -c "su - www-data -s /bin/sh -c 'PHP_MEMORY_LIMIT=512M php /var/www/html/occ app:install mail'" - docker exec -ti isard-apps-nextcloud-app /bin/sh -c "su - www-data -s /bin/sh -c 'PHP_MEMORY_LIMIT=512M php /var/www/html/occ app:enable mail'" - docker exec -ti isard-apps-nextcloud-app /bin/sh -c "su - www-data -s /bin/sh -c 'PHP_MEMORY_LIMIT=512M php /var/www/html/occ app:install user_saml'" - docker exec -ti isard-apps-nextcloud-app /bin/sh -c "su - www-data -s /bin/sh -c 'PHP_MEMORY_LIMIT=512M php /var/www/html/occ app:enable user_saml'" - docker exec -ti isard-apps-nextcloud-app /bin/sh -c "su - www-data -s /bin/sh -c 'PHP_MEMORY_LIMIT=512M php /var/www/html/occ app:install ownpad'" + 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: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 docker exec isard-apps-nextcloud-app sh -c 'jq ". + {\"pad\": [\"application/x-ownpad\"], \"calc\": [\"application/x-ownpad\"]}" /var/www/html/resources/config/mimetypemapping.dist.json > /var/www/html/config/mimetypemapping.json' nextcloud_scan # Open pads in a new tab/window docker exec isard-apps-nextcloud-app sed -i.orig 's/^\(\s*\)\(var viewer = OC.generateUrl.*\)/\1\2\n\1window.open(viewer);\n\1return;/' /var/www/html/custom_apps/ownpad/js/ownpad.js - docker exec -ti isard-apps-nextcloud-app /bin/sh -c "su - www-data -s /bin/sh -c 'PHP_MEMORY_LIMIT=512M php /var/www/html/occ app:enable ownpad'" + docker exec -u www-data isard-apps-nextcloud-app php occ app:enable ownpad docker exec -u www-data isard-apps-nextcloud-app php occ --no-warnings config:app:set ownpad ownpad_etherpad_enable --value="yes" docker exec -u www-data isard-apps-nextcloud-app php occ --no-warnings config:app:set ownpad ownpad_etherpad_host --value="https://pad.$DOMAIN" @@ -238,7 +238,7 @@ setup_nextcloud(){ nextcloud_scan(){ # The folders shown as 'not writeable' are empty user folders. Not a problem. - docker exec -ti isard-apps-nextcloud-app /bin/sh -c "su - www-data -s /bin/sh -c 'PHP_MEMORY_LIMIT=512M php /var/www/html/occ files:scan --all'" + docker exec -u www-data isard-apps-nextcloud-app php occ files:scan --all } setup_moodle(){ @@ -258,7 +258,7 @@ 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 --version=2.1.5 --activate' docker-compose run --user=33 isard-apps-wordpress-cli /bin/bash -c 'wp plugin install generateblocks --activate' docker-compose run --user=33 isard-apps-wordpress-cli /bin/bash -c 'wp plugin activate generateblocks --network' docker-compose run --user=33 isard-apps-wordpress-cli /bin/bash -c 'wp plugin delete hola' diff --git a/isard-apps b/isard-apps index c0f7ee1..2419813 160000 --- a/isard-apps +++ b/isard-apps @@ -1 +1 @@ -Subproject commit c0f7ee13b2c0daae32a4e05eb8411192038df0c0 +Subproject commit 24198139c5f8fb40925312b672a531e464d64126 diff --git a/isard-sso b/isard-sso index 3391e00..9fc08ee 160000 --- a/isard-sso +++ b/isard-sso @@ -1 +1 @@ -Subproject commit 3391e00cc32b03e6d12268f53c0bec2f4e2c74f5 +Subproject commit 9fc08ee6a3bbf27f27bc66689f0c2af4789bc2cc