absolute (instead of protocol relative) asset urls
parent
205aa771d1
commit
c01c38364d
|
@ -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
|
||||
|
||||
|
|
|
@ -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 = ""
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue