Fixup the debian install path (#203)

spinnaker · Mar 6, 2017 · c2ca6d4 · c2ca6d4
1 parent 118cfc4
commit c2ca6d4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/...rc/main/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/profile/ProfileConfig.java b/...rc/main/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/profile/ProfileConfig.java
@@ -34,6 +34,11 @@ public String getPrimaryConfigContents() {
     return configContents.getOrDefault(primaryConfigFile, "");
   }
 
+  public ProfileConfig setConfig(String path, String config) {
+    configContents.put(path, config);
+    return this;
+  }
+
   public ProfileConfig extendConfig(String path, String config) {
     config = configContents.getOrDefault(path, "") + "\n" + config;
     configContents.put(path, config);

diff --git a/...main/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/profile/SpinnakerProfile.java b/...main/java/com/netflix/spinnaker/halyard/deploy/spinnaker/v1/profile/SpinnakerProfile.java
@@ -77,7 +77,7 @@ public ProfileConfig getFullConfig(String deploymentName, SpinnakerEndpoints end
     ProfileConfig result = generateFullConfig(getBaseConfig(deploymentConfiguration),
         deploymentConfiguration,
         endpoints);
-    result.extendConfig(result.getPrimaryConfigFile(), EDIT_WARNING + result.getPrimaryConfigContents());
+    result.setConfig(result.getPrimaryConfigFile(), EDIT_WARNING + result.getPrimaryConfigContents());
     return result;
   }
 

diff --git a/halyard-deploy/src/main/resources/debian/install.sh b/halyard-deploy/src/main/resources/debian/install.sh
@@ -72,7 +72,7 @@ function add_spinnaker_apt_repository() {
       echo "$gpg" | apt-key add -
     fi
   fi
-  echo "deb $REPOSITORY_URL $DISTRIB_CODENAME spinnaker" | tee /etc/apt/sources.list.d/spinnaker-dev.list > /dev/null
+  echo "deb $REPOSITORY_URL $DISTRIB_CODENAME spinnaker" | tee /etc/apt/sources.list.d/spinnaker-hal.list > /dev/null
 }
 
 function add_java_apt_repository() {
@@ -160,4 +160,8 @@ if [ -n "$INSTALL_SPINNAKER" ]; then
   if contains "${SPINNAKER_ARTIFACTS[@]}" "deck"; then
     install_apache2
   fi
+
+  mkdir -p /opt/spinnaker/config/
+  chown spinnaker /opt/spinnaker/config/
+  mv ${CONFIG_DIR}/*.yml /opt/spinnaker/config/
 fi