From ce030678553c7b4fbc7892b4e84d6cba705043e2 Mon Sep 17 00:00:00 2001 From: joergmschulz Date: Mon, 21 Nov 2022 23:47:44 +0100 Subject: [PATCH 1/3] remove wildcard from traefik example --- examples/docker-compose.yml.traefik | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/docker-compose.yml.traefik b/examples/docker-compose.yml.traefik index 727d31b..b879c5b 100644 --- a/examples/docker-compose.yml.traefik +++ b/examples/docker-compose.yml.traefik @@ -26,7 +26,7 @@ services: - ADMIN_USER=admin - ADMIN_PASS=collabora-online - - ALLOWED_HOSTS=^(.*)\.example\.org + - ALLOWED_HOSTS=host1.example.org,host2.example.org,host1.example.net - ENABLE_TLS=FALSE - ENABLE_TLS_REVERSE_PROXY=TRUE From 62bdbc995873c3fbc948455688571159550a0cf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rg=20Michael=20Schulz?= Date: Tue, 22 Nov 2022 00:05:46 +0100 Subject: [PATCH 2/3] example with multi hosts --- .vs/docker-collabora-online/xs/UserPrefs.xml | 3 +++ docker-collabora-online.sln | 17 +++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 .vs/docker-collabora-online/xs/UserPrefs.xml create mode 100644 docker-collabora-online.sln diff --git a/.vs/docker-collabora-online/xs/UserPrefs.xml b/.vs/docker-collabora-online/xs/UserPrefs.xml new file mode 100644 index 0000000..f9c3b07 --- /dev/null +++ b/.vs/docker-collabora-online/xs/UserPrefs.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/docker-collabora-online.sln b/docker-collabora-online.sln new file mode 100644 index 0000000..70c3497 --- /dev/null +++ b/docker-collabora-online.sln @@ -0,0 +1,17 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 25.0.1704.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {8F5EFA8D-1117-4BA2-8B7E-9B11AC96E1A2} + EndGlobalSection +EndGlobal From bd8b13c956045e837e878dd25f3b3ae33686714d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rg=20Michael=20Schulz?= Date: Tue, 22 Nov 2022 00:10:11 +0100 Subject: [PATCH 3/3] Update docker-compose.yml multiple hosts --- examples/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/docker-compose.yml b/examples/docker-compose.yml index 6221596..d75430e 100644 --- a/examples/docker-compose.yml +++ b/examples/docker-compose.yml @@ -28,7 +28,7 @@ services: - ADMIN_USER=admin - ADMIN_PASS=collabora-online - - ALLOWED_HOSTS=allowedhostname.example.com + - ALLOWED_HOSTS=host1.example.org,host2.example.org,host1.example.net - DICTIONARIES="en_GB en_US" - LOG_LEVEL=warning networks: