db

Makefile

@@ -7,9 +7,6 @@ export VERSION
 
 BUILD_ROOT_PATH=$(shell pwd)
 
-#all: tidy gen test build docker
-#.PHONY: all
-
 all: environment moodle nextcloud 
 	cp .env docker/postgresql
 	cp .env docker/mariadb
@@ -25,6 +22,17 @@ all: environment moodle nextcloud
 					-f docker/network.yml \
 					config > docker-compose.yml
 
+start: all
+	docker-compose up -d --no-deps
+
+add-plugins:
+	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'"
+
+cleanup:
+	docker-compose down
+	rm -rf /opt/isard-apps
+
+
 environment:
 	cp main.conf .env
 	echo "BUILD_ROOT_PATH=$(BUILD_ROOT_PATH)" >> .env
@@ -82,10 +90,14 @@ backup-databases:
 restore-databases:
 	echo "Todo"
 
-snapshot-databases:
+db-snapshot-create: environment
-	echo "Todo"
+	docker exec -t isard-apps-postgresql pg_dumpall -c -U admin > backups/db-snapshot.sql
+	#docker exec -t isard-apps-postgresql pg_dumpall -c -U admin | gzip > backups/db-snapshot.sql.gz
+	echo $$DOMAIN
+	sed -i 's/$(DOMAIN)/DDOOMMAAIINN/g' backups/db-snapshot.sql
 
-replicate: environment
+db-snapshot-restore: environment
+	echo "Old domain"
 	cp .env docker/postgresql
 	cp .env docker/mariadb
 	docker-compose 	-f docker/postgresql/postgresql.yml \
@@ -95,14 +107,18 @@ replicate: environment
 	echo "Starting system databases..."
 	docker-compose -f databases.yml up -d --no-deps
 
-        echo "Substitute DOMAIN with: $DOMAIN"
+	echo "Substitute DOMAIN with: $$DOMAIN"
-	grep -rl digitaldemocratic.net . | xargs sed -i 's/digitaldemocratic.net/$DOMAIN/g'
+	cp backups/db-snapshot.sql backups/db-snapshot_$$DOMAIN.sql
+	sed -i 's/DDOOMMAAIINN/$(DOMAIN)/g' backups/db-snapshot_$$DOMAIN.sql
 
 	echo "Generating new private/public certificates for SAML..."
-	openssl req  -nodes -new -x509  -keyout certs/private.key -out certs/public.cert
+	openssl req  -nodes -new -x509  -keyout backups/certs/private.key -out backups/certs/public.cert
 
 	echo "Substitute CERTIFICATES with new ones'
 	grep -rl oldtext . | xargs sed -i 's/oldtext/newtext/g'
 
 	echo "Restoring new SQL info in databases..."
 	docker exec -i isard-apps-postgresql psql -U admin --set ON_ERROR_STOP=on -f backups/sample.sql
+
+	echo "Cleaning up"
+	rm databases.yml

backups/certs/default_private.key

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCtDWj9al/3Cd2N
+UM1sP+8KXiSiPC+BIpEX5ep5G59qV1XRrjSykl8tJ0Na/57T18ZrViBS0RPiS83y
+zKKpplcN0SDbNqz6yBDnt7CWH5m+XJGbwfWBDvfVX6wfe26ONekQpOnzsZxHHIiR
+cVvE3qk4oVQuDZqaGZSykJoaCJUuou+k2gI+rF2lZl69sOkqCkKATc5D1r2IDlmz
+Rj85k+QT/2r3iyQf2QaDnOGmiubEBaf3iwHaX0G9MQFb0YX1XHSrfXPkINa5Gf4I
+W2DvV6BrT5Szbu732NQUBnak5Thsa/Ttg3gcJI176EV4Jb9z6AGl7NJd5iAQr/ZK
+rrK10shBAgMBAAECggEAb0xeqA3QZqwbqBW96M89yGdAHG+lBeLbeolOwlF3uAcv
+lMn77pWhTQMhmNcqqYjvfn1IELuTlEm4zV27iG0JNEO6ZALIQgqGhOFpW0Q7t2kF
+5S1b3oNn9f2wUBcsxZ36pc/LAAbNQhch5pkHspiaMWfhIjVxp4aoUigaVIAMoo7s
+wGVK/7N+aw6IlziVOmsexBSkf6LMvykjJCH0RfNuIHXhqdVbaz1jZkdbJF6frny9
+n3c9gkFWc3+GnHTr4suehJnUOk7BWq3qBmwGexaIjSxNhucVlWNdiYBidTMq9vP6
+jfu+ueoWyADu+W+0075PHY+co2sdqguiOixdc2SpIQKBgQDmi/bB8uPrdHBchyhq
+ZhHsErUQ6CxtugVQxtl1bwc/UOeSof0nBRrmYadPWmU4zfTD8wqHgfLJhlSRstWD
+wj4VP6rm8ipn1qwBG/vo/uTf/BojG4KctVDXLIRepaYozGGQSMxOetXWz6osI2Q/
+j3ChMR+A1FK7m5iilfEzbeAY5QKBgQDAKHXCzGGbqHhvIzM1LB38hSpkV6xTaaog
+tkQ9IOFuCkNOfZ8oNfvUMOhiHJGFaE6MdcfJntK4MzqvT5vi9YYTnzoTQTdo9cvq
+zD5ZnQQOsy3AF8Fj+sjiW4/eaQNq9VsmZuWoSjhSfsP9jGXGeGxUcY3o0r07ifbO
+u6LcY9ZILQKBgDWoO60WL8+8EO6oElL5IJC2JegicTy0f8o2DaSUS7aDyPHKu9Wa
+DZGzBrKkUkyvOplkdn3lU7Ftjz89xQ3eZn6hi9AmapIyV2QGtFGdCX3L+fVT0MlS
+Nddup/wzR4HVV5uyJcLaOey99lhBgHJ+mvMZMMDWKc86PoMQrMuQdgi1AoGAFmdh
+O4IKy1Q8HnETMlrfcCayh5p1PBBwxnmZwSrJPcQyjr80xEJvBxFgtrev+8bqiZPd
+5FMBLHrEl9YHTdHkfPsukTokVLd7u/duOZKF+5TGe8QJRzfhHgsg3gSOYnUS2Ipc
+sl9c67ld7nzlDNvTfZDzw7Z2W6+9N+NGnL2DKU0CgYEAvrCbTagcCsbUj9YWhTLv
+/p4J3/dZBNN5LAbHiSSfRiUK7BuiiNWJK7DR3jYIi4+y1k/xLCIqWV6fCPPXfq/T
+nbkA1ttELLBF4FR0VrrTaN7U3uKqbuykeIAqT1ScqHfyNprUJeqH4aXtjzqvqnpT
+fF3mBBj72rRoXUWNqFWf808=
+-----END PRIVATE KEY-----

backups/certs/default_public.cert

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDazCCAlOgAwIBAgIUec9JN0Cpq6ZiBtErme8aB/PQW3MwDQYJKoZIhvcNAQEL
+BQAwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMTA0MDgwNTAyMTJaFw0yMTA1
+MDgwNTAyMTJaMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw
+HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCtDWj9al/3Cd2NUM1sP+8KXiSiPC+BIpEX5ep5G59q
+V1XRrjSykl8tJ0Na/57T18ZrViBS0RPiS83yzKKpplcN0SDbNqz6yBDnt7CWH5m+
+XJGbwfWBDvfVX6wfe26ONekQpOnzsZxHHIiRcVvE3qk4oVQuDZqaGZSykJoaCJUu
+ou+k2gI+rF2lZl69sOkqCkKATc5D1r2IDlmzRj85k+QT/2r3iyQf2QaDnOGmiubE
+Baf3iwHaX0G9MQFb0YX1XHSrfXPkINa5Gf4IW2DvV6BrT5Szbu732NQUBnak5Ths
+a/Ttg3gcJI176EV4Jb9z6AGl7NJd5iAQr/ZKrrK10shBAgMBAAGjUzBRMB0GA1Ud
+DgQWBBQ5e/VWrY796POIJ5VNO8USQbgzoDAfBgNVHSMEGDAWgBQ5e/VWrY796POI
+J5VNO8USQbgzoDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAc
+j4rzQfvjCDgB+CkmukFBYD2eOnNiaUWJABwU5s1cFWda9B2CoCAzHOHj2Sdi7Sso
+5PBZ9LmrdNGzbJioUVUyEG72aRUxlxaJgAQKd7QN34Oic8Q+JlwKdP4Xm+mGk0T4
+Q2esz56gbEsm9qIX7XHFbCt1gNVh+VjjB0ZRR1kPIhvdX2a/4X5lFVgr3dyYxz57
+7ODc/gz6lTgnG71h9CEBuWA404BGZ1aGY1oj+FpZBYLoybqaAQrgtQUGM5KOTvGG
+KmBraRPWyjVHGKrbWn9oUG8zBxKrz9Nzcu8lV9NDEB3xSqLo6qXvFrTdT58SPe6O
+/VPef2l6eL0enjI62aqO
+-----END CERTIFICATE-----

config/nextcloud/run.sh

@@ -12,3 +12,5 @@
 
 # Import json with social login config
 #su - www-data -s /bin/sh -c 'PHP_MEMORY_LIMIT=512M php /var/www/html/occ config:import sociallogin.json'
+
+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/moodle/plugins.sh

@@ -1,7 +1,4 @@
 git clone https://github.com/isard-vdi/moodle-auth_saml2.git /var/www/html/auth/saml2
-#curl --location https://moodle.org/plugins/download.php/23298/auth_oidc_moodle310_2020110900.zip > auth_oidc.zip
-#unzip auth_oidc.zip -d /var/www/html/auth/
-#rm auth_oidc.zip
 
 curl --location https://moodle.org/plugins/download.php/23360/mod_jitsi_moodle310_2021020300.zip > jitsi.zip
 unzip jitsi.zip -d /var/www/html/mod/

init/nextcloud.sh

@@ -0,0 +1,9 @@
+echo "Installing plugins..."
+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'"
+while  $? == 255 ; do 
+    printf '.' ;
+    sleep .5 ;
+    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'"
+done
+
+#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'"

nextcloud.sh

@@ -0,0 +1,9 @@
+echo "Installing plugins..."
+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'"
+while [ $? == 255 ]; do \
+    printf '.' ;
+    sleep .5 ;
+    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'"
+done
+
+#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'"

test.sh

@@ -0,0 +1,4 @@
+	while ! 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'"
+	do
+		sleep 1
+	done