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

Automatic update
City-of-Helsinki · Aug 30, 2023 · 6623926 · 6623926
2 parents 751f50f + 4cd17c2
commit 6623926
Show file tree

Hide file tree

Showing 13 changed files with 183 additions and 245 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news.yml b/conf/cmi/external_entities.external_entity_type.helfi_news.yml
@@ -8,8 +8,8 @@ id: helfi_news
 label: 'Helfi: News'
 label_plural: 'Helfi: News'
 description: ''
-generate_aliases: null
 read_only: true
+generate_aliases: null
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml
@@ -8,8 +8,8 @@ id: helfi_news_groups
 label: 'Helfi: News groups'
 label_plural: 'Helfi: News groups'
 description: 'Retrieves news groups taxonomy terms from Helfi'
-generate_aliases: null
 read_only: true
+generate_aliases: null
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml
@@ -8,8 +8,8 @@ id: helfi_news_neighbourhoods
 label: 'Helfi: News neighbourhoods'
 label_plural: 'Helfi: News neighbourhoods'
 description: 'Retrieves news neighbourhoods taxonomy terms from Helfi'
-generate_aliases: null
 read_only: true
+generate_aliases: null
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:

diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml
@@ -8,8 +8,8 @@ id: helfi_news_tags
 label: 'Helfi: News tags'
 label_plural: 'Helfi: News tags'
 description: 'Retrieves news tags taxonomy terms from Helfi'
-generate_aliases: null
 read_only: true
+generate_aliases: null
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:

diff --git a/conf/cmi/system.action.user_add_role_action.super_administrator.yml b/conf/cmi/system.action.user_add_role_action.super_administrator.yml
@@ -0,0 +1,14 @@
+uuid: 2a1bbd58-b60a-4049-b1ad-bad3255ab395
+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
diff --git a/conf/cmi/system.action.user_remove_role_action.super_administrator.yml b/conf/cmi/system.action.user_remove_role_action.super_administrator.yml
@@ -0,0 +1,14 @@
+uuid: da39c805-f60d-4a78-a65e-b15f316079ad
+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
diff --git a/conf/cmi/user.role.super_administrator.yml b/conf/cmi/user.role.super_administrator.yml
@@ -0,0 +1,9 @@
+uuid: 3bc0ee2b-2306-4922-96e8-624be156d93a
+langcode: en
+status: true
+dependencies: {  }
+id: super_administrator
+label: 'Super administrator'
+weight: 7
+is_admin: true
+permissions: {  }
diff --git a/conf/cmi/views.view.tpr_unit_list.yml b/conf/cmi/views.view.tpr_unit_list.yml
@@ -76,6 +76,7 @@ display:
           batch: true
           batch_size: 50
           form_step: true
+          ajax_loader: false
           buttons: false
           action_title: Action
           clear_on_exposed: true
@@ -107,7 +108,6 @@ display:
               preconfiguration:
                 add_confirmation: false
                 label_override: 'Publish unit'
-          ajax_loader: false
         id:
           id: id
           table: tpr_unit_field_data

diff --git a/docker/openshift/Dockerfile b/docker/openshift/Dockerfile
@@ -1,13 +1,14 @@
-ARG DRUPAL_DOCKER_TAG=8.1
+ARG DRUPAL_DOCKER_TAG=8.2
 FROM ghcr.io/city-of-helsinki/drupal-docker-base:${DRUPAL_DOCKER_TAG}
 
 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

diff --git a/tools/make/include.mk b/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
 #

diff --git a/tools/make/kubectl.mk b/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)

diff --git a/tools/make/wordpress.mk b/tools/make/wordpress.mk