From 8ac0f60cc61dc4e9397dc4670c35bbc2a8d3f8fe Mon Sep 17 00:00:00 2001
From: Nicolas Leroux <nicolas@lunatech.com>
Date: Mon, 2 Sep 2024 20:19:19 +0200
Subject: [PATCH] merge

---
 conf/application.conf | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/conf/application.conf b/conf/application.conf
index 78ca283..2cd053b 100644
--- a/conf/application.conf
+++ b/conf/application.conf
@@ -10,33 +10,22 @@ githubBranch = master
 githubBranch = ${?github_branch}
 blogBackground = "https://lunatech.cdn.prismic.io/lunatech/c01fd6de48c3cdb8bda7247b0b94b84b14f3a488_kevin-horvat-1354011-unsplash.jpg"
 blogBackground = ${?blog_background}
-play.http.secret.key = ${?APPLICATION_SECRET}
+play.http.secret.key=${?APPLICATION_SECRET}
 cacheTtl = 3000 days
 cacheTtl = ${?cache_ttl}
 blogsPerPage = 24
 blogsPerPage = ${?blogs_per_page}
 play.filters.enabled += play.filters.hosts.AllowedHostsFilter
 play.filters.hosts {
-  allowed = [
-    "localhost:9000",
-    "127.0.0.1:8080",
-    "localhost:8080",
-    ".lunatech.com",
-  ]
+  # Allow requests to example.com, its subdomains, and localhost:9000.
+  allowed = ["localhost:9000","127.0.0.1:8080","localhost:8080", "lunatech-blog.cleverapps.io","app-4194741b-63fb-4618-b805-ff945b0be7eb.cleverapps.io", ".lunatech.com", ".lunatech.fr", ".lunatech.nl", ".lunatech.be"]
 }
 play.filters.enabled += "play.filters.cors.CORSFilter"
 play.filters.cors {
-  allowedOrigins = [
-    "https://lunatech.com",
-    "https://www.lunatech.com",
-    "https://blog.lunatech.com",
-    "https://blog.acceptance.lunatech.com",
-  ]
+  allowedOrigins = ["https://lunatech.com", "https://www.lunatech.com", "https://acceptance.lunatech.com", "https://lunatech.fr", "https://www.lunatech.fr", "https://acceptance.lunatech.fr", "https://lunatech.nl", "https://www.lunatech.nl", "https://acceptance.lunatech.nl",    "https://blog.lunatech.com", "https://blog.acceptance.lunatech.com" ]
 }
 trustxforwarded = true
 play.modules.enabled += "modules.StartModule"
 play.ws.cache.enabled = true
 play.ws.timeout.request = 360s
 play.ws.timeout.idle = 360s
-
-include "overrides.conf"