Removed /etc/default/spinnaker loading and spring config setting temp…

…orarily for upstream merge of upstart scripts.
spinnaker · Nov 13, 2015 · 0972426 · 0972426
1 parent 4ce9571
commit 0972426
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/clouddriver-web/clouddriver-web.gradle b/clouddriver-web/clouddriver-web.gradle
@@ -32,7 +32,7 @@ dependencies {
 tasks.bootRepackage.enabled = false
 
 applicationName = 'clouddriver'
-applicationDefaultJvmArgs = ["-Djava.security.egd=file:/dev/./urandom", "-Dspring.config.location=/opt/spinnaker/config/"]
+applicationDefaultJvmArgs = ["-Djava.security.egd=file:/dev/./urandom"]
 applicationDistribution.from(project.file('config')) {
   into 'config'
 }
@@ -52,10 +52,8 @@ jar {
   }
 }
 
-
 startScripts {
   doLast {
-    unixScript.text = unixScript.text.replace('DEFAULT_JVM_OPTS=', '\n if [ -f /etc/default/spinnaker ];then \n set -a\n . /etc/default/spinnaker \n set +a\n fi \n DEFAULT_JVM_OPTS=')
     unixScript.text = unixScript.text.replace('CLASSPATH=$APP_HOME', 'CLASSPATH=$APP_HOME/config:$APP_HOME')
     windowsScript.text = windowsScript.text.replace('set CLASSPATH=', 'set CLASSPATH=%APP_HOME%\\config;')
   }
@@ -98,10 +96,3 @@ ospackage {
 buildDeb {
   dependsOn installApp
 }
-
-buildRpm {
-  arch = NOARCH
-  os = LINUX
-  dependsOn installApp
-}
-