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

Automatic update
City-of-Helsinki · Apr 23, 2024 · 225d717 · 225d717
2 parents 1694f2b + 0065da0
commit 225d717
Show file tree

Hide file tree

Showing 4 changed files with 190 additions and 22 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
@@ -112,6 +112,7 @@ module:
   metatag_twitter_cards: 0
   metatag_views: 0
   migrate: 0
+  monolog: 0
   mysql: 0
   node: 0
   oembed_providers: 0

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;