Merge pull request #305 from City-of-Helsinki/update-configuration

Automatic update

conf/cmi/system.action.user_add_role_action.super_administrator.yml

@@ -0,0 +1,14 @@
+uuid: b4771df8-e4ea-4fbc-b9c3-80cf0be75387
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.super_administrator
+  module:
+    - user
+id: user_add_role_action.super_administrator
+label: 'Add the Super administrator role to the selected user(s)'
+type: user
+plugin: user_add_role_action
+configuration:
+  rid: super_administrator

conf/cmi/system.action.user_remove_role_action.super_administrator.yml

@@ -0,0 +1,14 @@
+uuid: ac41f299-4da8-46a7-91fc-8b2c48165bad
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.super_administrator
+  module:
+    - user
+id: user_remove_role_action.super_administrator
+label: 'Remove the Super administrator role from the selected user(s)'
+type: user
+plugin: user_remove_role_action
+configuration:
+  rid: super_administrator

conf/cmi/user.role.super_administrator.yml

@@ -0,0 +1,9 @@
+uuid: 74097722-87f0-4067-9a1a-de4e42b68948
+langcode: en
+status: true
+dependencies: {  }
+id: super_administrator
+label: 'Super administrator'
+weight: 7
+is_admin: true
+permissions: {  }

docker/openshift/Dockerfile

@@ -5,9 +5,10 @@ COPY / /var/www/html/
 WORKDIR /var/www/html
 RUN composer install --no-progress --profile --prefer-dist --no-interaction --no-dev --optimize-autoloader
 
-# Copy deploy script
-COPY docker/openshift/entrypoints/20-deploy.sh /entrypoints
-RUN chmod +x /entrypoints/20-deploy.sh
+# Copy ALL deploy scripts
+COPY docker/openshift/entrypoints/ /entrypoints
+RUN chmod +x /entrypoints/*
+
 
 # Copy cron scripts
 RUN mkdir /crons

tools/make/include.mk

@@ -12,7 +12,6 @@ include $(DRUIDFI_TOOLS_MAKE_DIR)qa.mk
 
 IS_DRUPAL ?= $(shell test -f $(WEBROOT)/sites/default/settings.php && echo yes || echo no)
 IS_SYMFONY ?= $(shell test -f config/bundles.php && echo yes || echo no)
-IS_WP ?= $(shell (test -f $(WEBROOT)/wp-settings.php || test -f conf/wp-config.php) && echo yes || echo no)
 
 ifeq ($(IS_DRUPAL),yes)
 include $(DRUIDFI_TOOLS_MAKE_DIR)drupal.mk
@@ -22,10 +21,6 @@ ifeq ($(IS_SYMFONY),yes)
 include $(DRUIDFI_TOOLS_MAKE_DIR)symfony.mk
 endif
 
-ifeq ($(IS_WP),yes)
-include $(DRUIDFI_TOOLS_MAKE_DIR)wordpress.mk
-endif
-
 #
 # Hosting systems
 #

tools/make/kubectl.mk

@@ -6,6 +6,7 @@ KUBECTL_WORKDIR ?= /app
 
 PHONY += kubectl-sync-db
 kubectl-sync-db: ## Sync database from Kubernetes
+	$(call drush,sql-drop --quiet -y)
 ifeq ($(DUMP_SQL_EXISTS),no)
 	$(eval POD := $(call kubectl_get_pod))
 	$(call step,Get database dump from $(POD)...\n)