diff --git a/app/templating/AssetHelper.scala b/app/templating/AssetHelper.scala index da547eb9ec..86712a53e8 100644 --- a/app/templating/AssetHelper.scala +++ b/app/templating/AssetHelper.scala @@ -20,7 +20,7 @@ trait AssetHelper { self: I18nHelper with SecurityHelper => lazy val sameAssetDomain = netDomain.value == assetDomain.value - lazy val assetBaseUrl = s"//$assetDomain" + lazy val assetBaseUrl = env.net.assetBaseUrl def assetVersion = AssetVersion.current diff --git a/conf/base.conf b/conf/base.conf index 843327ec16..5ad664a671 100644 --- a/conf/base.conf +++ b/conf/base.conf @@ -6,6 +6,7 @@ net { domain = "localhost:9663" socket.domains = [ "localhost:9664" ] asset.domain = ${net.domain} + asset.base_url = "http://"${net.asset.domain} base_url = "http://"${net.domain} ip = "127.0.0.1" email = "" diff --git a/modules/common/src/main/config.scala b/modules/common/src/main/config.scala index 02e01c87ac..2be0a1577c 100644 --- a/modules/common/src/main/config.scala +++ b/modules/common/src/main/config.scala @@ -35,6 +35,7 @@ object config { domain: NetDomain, @ConfigName("base_url") baseUrl: BaseUrl, @ConfigName("asset.domain") assetDomain: AssetDomain, + @ConfigName("asset.base_url") assetBaseUrl: String, @ConfigName("socket.domains") socketDomains: List[String], crawlable: Boolean, @ConfigName("ratelimit") rateLimit: RateLimit,