Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 2.11.2021 #151

Merged
merged 9 commits into from
Nov 2, 2021
197 changes: 130 additions & 67 deletions composer.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion conf/cmi/block.block.main_navigation_level_2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ settings:
views: views
menu_link_content: menu_link_content
default: '0'
level: 1
level: 2
depth: 0
expand_all_items: true
visibility:
Expand Down
1 change: 1 addition & 0 deletions conf/cmi/core.extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ module:
user: 0
varnish_purge_tags: 0
varnish_purger: 0
view_unpublished: 0
views_infinite_scroll: 0
views_ui: 0
pathauto: 1
Expand Down
1 change: 1 addition & 0 deletions conf/cmi/user.role.admin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,3 +147,4 @@ permissions:
- 'use siteimprove'
- 'administer siteimprove'
- 'use siteimprove prepublish'
- 'view any unpublished content'
3 changes: 2 additions & 1 deletion docker/openshift/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ghcr.io/city-of-helsinki/drupal-docker-base:8.0
ARG DRUPAL_DOCKER_TAG=8.0
FROM ghcr.io/city-of-helsinki/drupal-docker-base:${DRUPAL_DOCKER_TAG}

COPY / /var/www/html/
WORKDIR /var/www/html
Expand Down
1 change: 1 addition & 0 deletions docker/openshift/crons/base.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ echo "Starting cron: $(date)"

exec "/crons/migrate-tpr.sh" &
exec "/crons/purge-queue.sh" &
exec "/crons/update-translations.sh" &

while true
do
Expand Down
6 changes: 6 additions & 0 deletions docker/openshift/crons/update-translations.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash

sleep 10
drush locale:check || true
drush locale:update || true
drush helfi:locale-import helfi_platform_config || true