Merge branch 'new-flavours' into 'develop'

New flavours

See merge request digitaldemocratic/digitaldemocratic!31

.gitignore

@@ -1,5 +1,6 @@
 digitaldemocratic.conf
 docker-compose.yml
+devel.yml
 adminer.yml
 pgtuner.yml
 custom/

Makefile

@@ -97,6 +97,10 @@ add-plugins: connect-saml
 	# sleep 10
 	# docker exec -u www-data isard-apps-nextcloud-app sh -c 'export OC_PASS=$$DDADMIN_PASSWORD && php occ user:add --password-from-env --display-name="DD Admin" --group="admin" $$DDADMIN_USER'
 
+	# docker exec -u www-data isard-apps-nextcloud-app sh -c 'export OC_PASS=admin && php occ user:delete admin'
+	# docker exec -u www-data isard-apps-nextcloud-app sh -c 'export OC_PASS=LostAdminGroup && php occ user:add --password-from-env --display-name="Admin" --group="admin" admin'
+
+
 	# Wordpress
 	## Multisite
 	docker exec -ti isard-apps-wordpress /bin/sh -c "/multisite.sh"
@@ -190,3 +194,12 @@ upgrade-moodle:
 	docker exec -ti isard-apps-moodle php7 admin/cli/maintenance.php --enable
 	docker exec -ti isard-apps-moodle php7 admin/cli/upgrade.php --non-interactive --allow-unstable
 	docker exec -ti isard-apps-moodle php7 admin/cli/maintenance.php --disable
+
+.PHONY: devel
+devel: build
+	echo CUSTOM_PATH=$(CUSTOM_PATH) > .env
+	echo BUILD_ROOT_PATH=$(CUSTOM_PATH)/isard-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 \
+					config > devel.yml