fix(core): Switch location to additional-location (#527)

In boot2, location overrides rather than adds to the default config locations.
spinnaker · May 17, 2019 · 2443dd1 · 2443dd1
1 parent c88c7e3
commit 2443dd1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/front50-web/front50-web.gradle b/front50-web/front50-web.gradle
@@ -22,11 +22,11 @@ if (gradle.includedProviderProjects.contains(':front50-oracle')) {
 }
 
 ext {
-  springConfigLocation = System.getProperty('spring.config.location', "${System.getProperty('user.home')}/.spinnaker/")
+  springConfigLocation = System.getProperty('spring.config.additional-location', "${System.getProperty('user.home')}/.spinnaker/")
 }
 
 run {
-  systemProperty('spring.config.location', project.springConfigLocation)
+  systemProperty('spring.config.additional-location', project.springConfigLocation)
 }
 mainClassName = 'com.netflix.spinnaker.front50.Main'
 

diff --git a/front50-web/src/main/groovy/com/netflix/spinnaker/front50/Main.groovy b/front50-web/src/main/groovy/com/netflix/spinnaker/front50/Main.groovy
@@ -45,7 +45,7 @@ public class Main extends SpringBootServletInitializer {
     'netflix.environment'    : 'test',
     'netflix.account'        : '${netflix.environment}',
     'netflix.stack'          : 'test',
-    'spring.config.location' : '${user.home}/.spinnaker/',
+    'spring.config.additional-location' : '${user.home}/.spinnaker/',
     'spring.application.name': 'front50',
     'spring.config.name'     : 'spinnaker,${spring.application.name}',
     'spring.profiles.active' : '${netflix.environment},local'