Update configuration

City-of-Helsinki · Apr 26, 2024 · aebe3f8 · aebe3f8
1 parent d506bb0
commit aebe3f8
Show file tree

Hide file tree

Showing 10 changed files with 214 additions and 108 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,8 +8,8 @@ public/modules/contrib
 public/themes/contrib
 public/sites/default/files
 vendor
-helfi-test-automation-python/
 public/sites/simpletest/
+public/sites/backstop/
 
 # Ignore the folder created by PhpStorm
 .idea/*

diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml
@@ -104,6 +104,7 @@ module:
   metatag_open_graph: 0
   metatag_twitter_cards: 0
   migrate: 0
+  monolog: 0
   mysql: 0
   node: 0
   oembed_providers: 0

diff --git a/conf/cmi/helfi_api_base.features.yml b/conf/cmi/helfi_api_base.features.yml
@@ -1,2 +1,4 @@
-logger: true
+disable_email_sending: true
 disable_user_password: true
+user_expire: true
+logger: true
diff --git a/conf/cmi/rest.resource.helfi_debug_data.yml b/conf/cmi/rest.resource.helfi_debug_data.yml
diff --git a/conf/cmi/stage_file_proxy.settings.yml b/conf/cmi/stage_file_proxy.settings.yml
@@ -3,5 +3,6 @@ _core:
 hotlink: false
 origin: ''
 origin_dir: ''
+proxy_headers: ''
 use_imagecache_root: true
 verify: true
diff --git a/conf/cmi/system.action.user_add_role_action.debug_api.yml b/conf/cmi/system.action.user_add_role_action.debug_api.yml
diff --git a/conf/cmi/system.action.user_remove_role_action.debug_api.yml b/conf/cmi/system.action.user_remove_role_action.debug_api.yml
diff --git a/conf/cmi/user.role.debug_api.yml b/conf/cmi/user.role.debug_api.yml
diff --git a/docker/openshift/custom.locations b/docker/openshift/custom.locations
@@ -1,12 +1,3 @@
-location ~ ^/(?:.*)-assets/(.*)$ {
-  proxy_redirect off;
-  proxy_set_header Host $host;
-  proxy_set_header X-Forwarded-Proto https;
-  proxy_set_header X-Real-IP $remote_addr;
-  proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-  proxy_pass http://127.0.0.1:8080/$1$is_args$args;
-}
-
 location ~* \.(css|cur|js|jpe?g|gif|htc|ico|png|xml|otf|ttf|eot|woff|woff2|svg|mp4|svgz|ogg|ogv|pdf|pptx?|zip|tgz|gz|rar|bz2|doc|xls|exe|tar|mid|midi|wav|bmp|rtf|txt|map)$ {
   add_header Access-Control-Allow-Origin "*";
   try_files $uri @rewrite;