From 4c98da9f91de7fb9c54ce4e0b03b9840037bcd82 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 8 Jun 2021 20:50:50 +0200 Subject: [PATCH] Added pgtuner and moved adminer to not be there by default and cleaned conf.sample --- .gitignore | 2 + Makefile | 9 ++++- digitaldemocratic.conf.sample | 76 ++++++++++++++++++----------------- isard-sso | 2 +- 4 files changed, 50 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index f7c0f6c..5647482 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ digitaldemocratic.conf docker-compose.yml +adminer.yml +pgtuner.yml custom/ .env diff --git a/Makefile b/Makefile index 42cceb0..980ec66 100644 --- a/Makefile +++ b/Makefile @@ -54,7 +54,6 @@ build: environment -f isard-apps/docker/postgresql/postgresql.yml \ -f isard-sso/docker-compose-parts/admin.yml \ -f isard-sso/docker-compose-parts/backup.yml \ - -f isard-sso/docker-compose-parts/adminer.yml \ config > sso.yml #-f isard-sso/docker-compose-parts/freeipa.yml echo BUILD_ROOT_PATH=$(CUSTOM_PATH)/isard-apps > .env @@ -178,3 +177,11 @@ add-plugins: connect-saml connect-saml: up echo "Waiting for system to be fully up before personalizing... It can take some minutes..." while [ "`docker inspect -f {{.State.Health.Status}} isard-apps-moodle`" != "healthy" ]; do sleep 2; done + +adminer: + docker-compose -f isard-apps/docker/network.yml \ + -f isard-sso/docker-compose-parts/adminer.yml config > adminer.yml + +pgtuner: + docker-compose -f isard-apps/docker/network.yml \ + -f isard-sso/docker-compose-parts/pgtuner.yml config > pgtuner.yml \ No newline at end of file diff --git a/digitaldemocratic.conf.sample b/digitaldemocratic.conf.sample index e610358..5d30824 100644 --- a/digitaldemocratic.conf.sample +++ b/digitaldemocratic.conf.sample @@ -1,4 +1,4 @@ -## GLOBALS +# DIGITAL DEMOCRATIC GLOBAL ENV TITLE="Digital Democratic" DOMAIN=mydomain.com LETSENCRYPT_DNS= @@ -23,17 +23,14 @@ DDADMIN_USER=ddadmin DDADMIN_PASSWORD=Th3M@st3r DDADMIN_EMAIL=theemail@mymailserver.com -### ADMINAPP_KEYCLOAK_PASSWORD +## ADMINAPP (https://admin.$DOMAIN) +##============================================================================= ADMINAPP_USER=centre ADMINAPP_PASSWORD=Sup3rS3cret -#ADMINAPP_KEYCLOAK_PASSWORD=test -#ADMINAPP_MOODLE_PASSWORD=test -#ADMINAPP_NEXTCLOUD_PASSWORD=test - -### KEYCLOAK (sso) -########################################################################### -## DO NOT CHANGE. It is not being modified at container start +## KEYCLOAK (https://sso.$DOMAIN) +##============================================================================= +### DO NOT CHANGE KEYCLOAK_USER. It is not being modified at container start KEYCLOAK_USER=admin KEYCLOAK_PASSWORD=keycloakkeycloak @@ -42,51 +39,56 @@ KEYCLOAK_DB_DATABASE=keycloak KEYCLOAK_DB_USER=keycloak KEYCLOAK_DB_PASSWORD=keycloakkeycloak -### POSTGRES -########################################################################### -POSTGRES_PASSWORD=postgrespostgres -POSTGRES_USER=admin - -## MARIADB ADMIN -###MARIADB_USER=root -MARIADB_PASSWORD=SuperSecret - ## MOODLE -MOODLE_POSTGRES_USER=moodle -MOODLE_POSTGRES_PASSWORD=M00dl3 - +##============================================================================= MOODLE_ADMIN_USER=admin MOODLE_ADMIN_PASSWORD=M00dl3 MOODLE_SITENAME="Digital Democratic" - MOODLE_EMAIL=moodle-info@mymailserver.com MOODLE_MAIL_NOREPLY_ADDRESS=noreply@mymailserver.com MOODLE_MAIL_PREFIX=[moodle] -## NEXTCLOUD -NEXTCLOUD_POSTGRES_USER=nextcloud -NEXTCLOUD_POSTGRES_PASSWORD=N3xtcl0ud +MOODLE_POSTGRES_USER=moodle +MOODLE_POSTGRES_PASSWORD=M00dl3 +## NEXTCLOUD +##============================================================================= NEXTCLOUD_ADMIN_USER=admin NEXTCLOUD_ADMIN_PASSWORD=N3xtcl0ud -## ETHERPAD -ETHERPAD_POSTGRES_USER=etherpad -ETHERPAD_POSTGRES_PASSWORD=3th3rpad - -ETHERPAD_ADMIN_USER=admin -ETHERPAD_ADMIN_PASSWORD=SuperSecret -#ETHERPAD_API_KEY=NotImplemented +NEXTCLOUD_POSTGRES_USER=nextcloud +NEXTCLOUD_POSTGRES_PASSWORD=N3xtcl0ud ## WORDPRESS -WORDPRESS_MARIADB_USER=wordpress -WORDPRESS_MARIADB_PASSWORD=W0rdpr3ss - +##============================================================================= WORDPRESS_ADMIN_USER=admin WORDPRESS_ADMIN_PASSWORD=W0rdpr3ss +WORDPRESS_MARIADB_USER=wordpress +WORDPRESS_MARIADB_PASSWORD=W0rdpr3ss -### FREEIPA (ipa) -########################################################################### +## ETHERPAD +##============================================================================= +ETHERPAD_ADMIN_USER=admin +ETHERPAD_ADMIN_PASSWORD=SuperSecret + +ETHERPAD_POSTGRES_USER=etherpad +ETHERPAD_POSTGRES_PASSWORD=3th3rpad +### ETHERPAD_API_KEY=NotImplemented + +## POSTGRES (https://sso.$DOMAIN/isard-sso-adminer) +##============================================================================= +### The adminer user/pwd is admin/$KEYCLOAK_PASSWORD +POSTGRES_USER=admin +POSTGRES_PASSWORD=postgrespostgres + +## MARIADB (https://sso.$DOMAIN/isard-sso-adminer) +##============================================================================= +### The adminer user/pwd is admin/$KEYCLOAK_PASSWORD +### MARIADB_USER=root (it is the defaults in the container +MARIADB_PASSWORD=SuperSecret + +## FREEIPA (disabled) +##============================================================================= IPA_ADMIN_PWD=freeipafreeipa diff --git a/isard-sso b/isard-sso index 1edb71b..5041891 160000 --- a/isard-sso +++ b/isard-sso @@ -1 +1 @@ -Subproject commit 1edb71bb0ebe85170570a65b0cdcfd9f2812d71b +Subproject commit 50418914c9cd817fefbb684aa6e3952eb2e06537