Merge pull request #255 from City-of-Helsinki/UHF-10314

UHF-10314: Fixed authorization header
City-of-Helsinki · Jul 15, 2024 · 9db86f8 · 9db86f8
2 parents 32ce2e4 + 76a4768
commit 9db86f8
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 12 deletions.
diff --git a/docker/elastic-proxy/nginx.conf b/docker/elastic-proxy/nginx.conf
@@ -26,7 +26,7 @@ http {
       sub {
         use MIME::Base64;
         if (exists($ENV{"ELASTIC_USER"}) && exists($ENV{"ELASTIC_PASSWORD"})) {
-          return encode_base64($ENV{"ELASTIC_USER"} . ":" . $ENV{"ELASTIC_PASSWORD"});
+          return encode_base64($ENV{"ELASTIC_USER"} . ":" . $ENV{"ELASTIC_PASSWORD"}, "");
         }
         return "";
       }

diff --git a/documentation/README.md b/documentation/README.md
@@ -1,5 +1,13 @@
 # Documentation
 
+## Available modules
+
+[Available modules](/documentation/modules.md)
+
+## Automatic platform updates
+
+[Automatic updates](/documentation/automatic-updates.md)
+
 ## Development and local environment
 
 - [Local environment](/documentation/local.md)
@@ -14,20 +22,16 @@
 - [Syncing databases between environments](/documentation/openshift-db-sync.md)
 - [Building assets](/documentation/build-assets.md)
 - [Queue service](/documentation/queue.md)
+- [Search](/documentation/search.md)
 
-## Testing
-
-[Testing and CI](/documentation/testing.md)
-[PHPstan](/documentation/phpstan.md)
+## Projects
 
-## Available modules
+[List of all projects](/documentation/projects.md)
 
-[Available modules](/documentation/modules.md)
 
-## Projects
+## Testing
 
-[List of all projects](/documentation/projects.md)
+[Testing and CI](/documentation/testing.md)
+[PHPstan](/documentation/phpstan.md)
 
-## Automatic platform updates
 
-[Automatic updates](/documentation/automatic-updates.md)
diff --git a/documentation/local.md b/documentation/local.md
@@ -34,7 +34,7 @@ Currently available profiles:
 
 ### Customizing docker-compose.yml
 
-The default `docker-compose.yml` file is intended to be updated automatically from upstream and should have no customizations.
+The default `compose.yaml` file is intended to be updated automatically from upstream and should have no customizations.
 
 You can create a `docker-compose.override.yml` file to add or override existing features.
 

diff --git a/documentation/search.md b/documentation/search.md
@@ -0,0 +1,14 @@
+# Elasticsearch
+
+See [ElasticSearch, React search apps and Proxys](https://helsinkisolutionoffice.atlassian.net/wiki/spaces/HEL/pages/8202256385/ElasticSearch+React+search+apps+and+Proxys) for more documentation about ElasticSearch.
+
+The default Elastic proxy URL is `https://elastic-proxy-${COMPOSE_PROJECT_NAME}.docker.so`.
+
+Local Elastic container and the proxy are configured in `compose.yaml` and the proxy's nginx configuration is found in `docker/elastic-proxy` folder.
+
+Elastic security features are disabled on local by `xpack.security.enabled=false` environment variable defined in `compose.yaml`.
+
+## Usage
+
+- Add `ELASTIC_PROXY_URL=https://your-elastic-proxy-url` to `.env` file
+- Make sure `COMPOSE_PROFILES` variable in `.env` contains `search`. See [Compose profiles](/documentation/local.md#compose-profiles) for more documentation.