diff --git a/dd-ctl b/dd-ctl index 00dc8f0..31bd3d1 100755 --- a/dd-ctl +++ b/dd-ctl @@ -139,25 +139,25 @@ update_repo(){ build_compose(){ ## Prepare apps environment - cp .env isard-apps/.env - echo "CUSTOM_PATH=$CUSTOM_PATH" >> isard-apps/.env - echo "BUILD_ROOT_PATH=$CUSTOM_PATH/isard-apps" >> isard-apps/.env - cp isard-apps/.env isard-apps/docker/postgresql && \ - cp isard-apps/.env isard-apps/docker/mariadb && \ - cp isard-apps/.env isard-apps/docker/moodle && \ - cp isard-apps/.env isard-apps/docker/nextcloud && \ - cp isard-apps/.env isard-apps/docker/wordpress && \ - cp isard-apps/.env isard-apps/docker/etherpad + cp .env dd-apps/.env + echo "CUSTOM_PATH=$CUSTOM_PATH" >> dd-apps/.env + echo "BUILD_ROOT_PATH=$CUSTOM_PATH/dd-apps" >> dd-apps/.env + cp dd-apps/.env dd-apps/docker/postgresql && \ + cp dd-apps/.env dd-apps/docker/mariadb && \ + cp dd-apps/.env dd-apps/docker/moodle && \ + cp dd-apps/.env dd-apps/docker/nextcloud && \ + cp dd-apps/.env dd-apps/docker/wordpress && \ + cp dd-apps/.env dd-apps/docker/etherpad ## Prepare sso environment - cp .env isard-sso/.env - echo "CUSTOM_PATH=$CUSTOM_PATH" >> isard-sso/.env - echo "BUILD_ROOT_PATH=$CUSTOM_PATH/isard-sso" >> isard-sso/.env - cp isard-sso/.env isard-sso/docker-compose-parts/.env + cp .env dd-sso/.env + echo "CUSTOM_PATH=$CUSTOM_PATH" >> dd-sso/.env + echo "BUILD_ROOT_PATH=$CUSTOM_PATH/dd-sso" >> dd-sso/.env + cp dd-sso/.env dd-sso/docker-compose-parts/.env mkdir -p custom/system/keycloak - cp -R isard-sso/docker/keycloak/themes custom/system/keycloak/ + cp -R dd-sso/docker/keycloak/themes custom/system/keycloak/ cp custom/login/logo.png custom/system/keycloak/themes/liiibrelite/login/resources/img/logo.png cp custom/login/background.png custom/system/keycloak/themes/liiibrelite/login/resources/img/loginBG.png cp custom/login/background.png custom/system/keycloak/themes/liiibrelite/login/resources/img/loginBG2.png @@ -170,26 +170,26 @@ build_compose(){ # Build compose ymls echo CUSTOM_PATH=$CUSTOM_PATH > .env - echo BUILD_ROOT_PATH=$CUSTOM_PATH/isard-sso >> .env - docker-compose -f isard-sso/docker-compose-parts/$BEHIND \ - -f isard-sso/docker-compose-parts/api.yml \ - -f isard-sso/docker-compose-parts/keycloak.yml \ - -f isard-sso/docker-compose-parts/avatars.yml \ - -f isard-apps/docker/postgresql/postgresql.yml \ - -f isard-sso/docker-compose-parts/admin.yml \ - -f isard-sso/docker-compose-parts/backup.yml \ + echo BUILD_ROOT_PATH=$CUSTOM_PATH/dd-sso >> .env + docker-compose -f dd-sso/docker-compose-parts/$BEHIND \ + -f dd-sso/docker-compose-parts/api.yml \ + -f dd-sso/docker-compose-parts/keycloak.yml \ + -f dd-sso/docker-compose-parts/avatars.yml \ + -f dd-apps/docker/postgresql/postgresql.yml \ + -f dd-sso/docker-compose-parts/admin.yml \ + -f dd-sso/docker-compose-parts/backup.yml \ config > sso.yml - #-f isard-sso/docker-compose-parts/freeipa.yml - echo BUILD_ROOT_PATH=$CUSTOM_PATH/isard-apps > .env - docker-compose -f isard-apps/docker/moodle/moodle.yml \ - -f isard-apps/docker/nextcloud/nextcloud.yml \ - -f isard-apps/docker/wordpress/wordpress.yml \ - -f isard-apps/docker/etherpad/etherpad.yml \ - -f isard-apps/docker/onlyoffice/onlyoffice.yml \ - -f isard-apps/docker/redis/redis.yml \ - -f isard-apps/docker/postgresql/postgresql.yml \ - -f isard-apps/docker/mariadb/mariadb.yml \ - -f isard-apps/docker/network.yml \ + #-f dd-sso/docker-compose-parts/freeipa.yml + echo BUILD_ROOT_PATH=$CUSTOM_PATH/dd-apps > .env + docker-compose -f dd-apps/docker/moodle/moodle.yml \ + -f dd-apps/docker/nextcloud/nextcloud.yml \ + -f dd-apps/docker/wordpress/wordpress.yml \ + -f dd-apps/docker/etherpad/etherpad.yml \ + -f dd-apps/docker/onlyoffice/onlyoffice.yml \ + -f dd-apps/docker/redis/redis.yml \ + -f dd-apps/docker/postgresql/postgresql.yml \ + -f dd-apps/docker/mariadb/mariadb.yml \ + -f dd-apps/docker/network.yml \ config > apps.yml docker-compose -f sso.yml -f apps.yml config > docker-compose.yml rm sso.yml apps.yml @@ -203,20 +203,20 @@ build(){ build_compose_develop(){ build_compose ## Prepare sso environment - cp .env isard-sso/.env - echo "CUSTOM_PATH=$CUSTOM_PATH" >> isard-sso/.env - echo "BUILD_ROOT_PATH=$CUSTOM_PATH/isard-sso" >> isard-sso/.env - cp isard-sso/.env isard-sso/docker-compose-parts/.env + cp .env dd-sso/.env + echo "CUSTOM_PATH=$CUSTOM_PATH" >> dd-sso/.env + echo "BUILD_ROOT_PATH=$CUSTOM_PATH/dd-sso" >> dd-sso/.env + cp dd-sso/.env dd-sso/docker-compose-parts/.env # Build compose ymls echo CUSTOM_PATH=$CUSTOM_PATH > .env - echo BUILD_ROOT_PATH=$CUSTOM_PATH/isard-sso >> .env + echo BUILD_ROOT_PATH=$CUSTOM_PATH/dd-sso >> .env # echo CUSTOM_PATH=$(CUSTOM_PATH) > .env - # echo BUILD_ROOT_PATH=$(CUSTOM_PATH)/isard-sso >> .env + # echo BUILD_ROOT_PATH=$(CUSTOM_PATH)/dd-sso >> .env docker-compose -f docker-compose.yml \ - -f isard-sso/docker-compose-parts/api.devel.yml \ - -f isard-sso/docker-compose-parts/admin.devel.yml \ + -f dd-sso/docker-compose-parts/api.devel.yml \ + -f dd-sso/docker-compose-parts/admin.devel.yml \ config > devel.yml } @@ -324,7 +324,7 @@ setup_nextcloud(){ # Add default file for moodle activities if [ ! -f $DATA_FOLDER/nextcloud/admin/files/template.docx ]; then - cp isard-apps/docker/nextcloud/template.docx $DATA_FOLDER/nextcloud/admin/files/ + cp dd-apps/docker/nextcloud/template.docx $DATA_FOLDER/nextcloud/admin/files/ nextcloud_scan fi @@ -355,7 +355,7 @@ setup_wordpress(){ # 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 activate onelogin-saml-sso' - # cp -R isard-apps/docker/nextcloud/onelogin-saml-sso $SRC_FOLDER/wordpress/wp-content/plugins/ + # cp -R dd-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' docker-compose run --user=33 isard-apps-wordpress-cli /bin/bash -c 'wp plugin activate generateblocks --network' @@ -413,8 +413,8 @@ upgrade_moodle(){ } extras_adminer(){ - docker-compose -f isard-apps/docker/network.yml \ - -f isard-sso/docker-compose-parts/adminer.yml config > adminer.yml + docker-compose -f dd-apps/docker/network.yml \ + -f dd-sso/docker-compose-parts/adminer.yml config > adminer.yml echo " --> Generated adminer.yml" echo " Bring it up: docker-compose -f adminer.yml up -d" echo " Connect to: https://sso.$DOMAIN/isard-sso-adminer/" @@ -425,8 +425,8 @@ extras_adminer(){ } extras_pgtuner(){ - docker-compose -f isard-apps/docker/network.yml \ - -f isard-sso/docker-compose-parts/pgtuner.yml config > pgtuner.yml + docker-compose -f dd-apps/docker/network.yml \ + -f dd-sso/docker-compose-parts/pgtuner.yml config > pgtuner.yml echo " --> Generated pgtuner.yml" } @@ -534,11 +534,11 @@ upgrade_plugins_moodle(){ } upgrade_plugins_nextcloud(){ - cp -R isard-apps/docker/nextcloud/src/* $SRC_FOLDER/nextcloud/ + cp -R dd-apps/docker/nextcloud/src/* $SRC_FOLDER/nextcloud/ } upgrade_plugins_wp(){ - cp -R isard-apps/docker/wordpress/src/* $SRC_FOLDER/wordpress/ + cp -R dd-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