updated

Makefile

@@ -10,7 +10,7 @@ BUILD_ROOT_PATH=$(shell pwd)
 environment:
 	git submodule update --init --recursive
 	cp custom/menu/* isard-sso/docker/api/src/
-	cp custom/img/* isard-sso/docker/api/src_nginx/api/static/img/
+	cp custom/img/* isard-sso/docker/api/src/api/static/img/
 	cp digitaldemocratic.conf isard-apps/.env
 	echo "BUILD_ROOT_PATH=$(BUILD_ROOT_PATH)/isard-apps" >> isard-apps/.env
 	cp isard-apps/.env isard-apps/docker/postgresql && \
@@ -30,6 +30,7 @@ build: environment
 					-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/backup.yml \
 					config > sso.yml
 	docker-compose 	-f isard-apps/docker/moodle/moodle.yml \
 					-f isard-apps/docker/nextcloud/nextcloud.yml \
@@ -98,4 +99,4 @@ add-plugins:
 	docker exec -ti isard-apps-wordpress /bin/sh -c "/multisite.sh"
 
 connect-saml:
-	while [ "`docker inspect -f {{.State.Health.Status}} isard-apps-moodle`" != "healthy" ]; do     sleep 2; done
+	while [ "`docker inspect -f {{.State.Health.Status}} isard-apps-moodle`" != "healthy" ]; do     sleep 2; done

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-----

backups/dump_database.sh

@@ -0,0 +1,2 @@
+#docker exec -t isard-apps-postgresql pg_dumpall -c -U admin > dump_`date +%d-%m-%Y"_"%H_%M_%S`.sql
+docker exec -t isard-apps-postgresql pg_dumpall -c -U admin | gzip > ./dump_$(date +"%Y-%m-%d_%H_%M_%S").gz

backups/replace_database.sh

@@ -0,0 +1,3 @@
+#docker exec -t isard-apps-postgresql pg_dumpall -c -U admin > dump_`date +%d-%m-%Y"_"%H_%M_%S`.sql
+docker exec -t isard-apps-postgresql pg_dumpall -c -U admin | gzip > ./dump_$(date +"%Y-%m-%d_%H_%M_%S").gz
+gunzip < $1 | docker exec -i isard-apps-postgresql psql -U admin -d $2

backups/reset_nextcloud.sh

@@ -0,0 +1,10 @@
+cp ../.env .
+source .env
+docker-compose stop isard-apps-nextcloud-app
+docker rm isard-apps-nextcloud-app
+rm -rf /opt/isard-office/nextcloud
+
+echo "DROP DATABASE nextcloud;" | docker exec -i isard-apps-postgresql psql -U admin
+docker-compose up -d isard-apps-nextcloud-app
+docker-compose restart isard-apps-nextcloud-nginx
+docker logs isard-apps-nextcloud-app --follow

backups/reset_wordpress.sh

@@ -0,0 +1,9 @@
+cp ../.env .
+source .env
+docker-compose stop isard-apps-wordpress
+docker rm isard-apps-wordpress
+rm -rf /opt/isard-office/wordpress
+echo "DROP DATABASE wordpress;" | docker exec -i isard-apps-postgresql psql -U admin
+docker-compose up -d isard-apps-wordpress
+docker-compose restart isard-apps-wordress-cli
+docker logs isard-apps-wordpress --follow

backups/restore_database.sh

@@ -0,0 +1 @@
+gunzip < $1 | docker exec -i isard-apps-postgresql psql -U admin -d $2

digitaldemocratic.conf.example

@@ -8,6 +8,7 @@ GANDI_KEY=
 DB_FOLDER=/opt/digitaldemocratic/db
 DATA_FOLDER=/opt/digitaldemocratic/data
 SRC_FOLDER=/opt/digitaldemocratic/src
+BACKUP_FOLDER=/opt/digitaldemocratic/backup
 
 LANG=es_ES.UTF-8
 LANGUAGE=es_ES:ca

isard-apps

@@ -1 +1 @@
-Subproject commit a3035c5f57b07b2c7bd9437337312fafb44cfa8b
+Subproject commit f534430bdbbd3c53cc6d9c93f3dabd68f72cc5aa

isard-sso

@@ -1 +1 @@
-Subproject commit eea6982e8401f39b076c4a75a1501a613d0907a5
+Subproject commit 87d81a9a78d55623e846b7ae653f3aab2815cc68