remove another unnecessary key from template.

AnalogJ · Apr 20, 2018 · 6fd3cbf · 6fd3cbf
1 parent 4427eee
commit 6fd3cbf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/pkg/config/template.go b/pkg/config/template.go
@@ -32,7 +32,7 @@ func configTemplatePrefix(answerData map[string]interface{}) string {
 		#
 		# Answers:`)
 	for key, value := range answerData {
-		if key == "config_dir" || key == "pem_dir" || key == "active_extra_templates" {
+		if key == "config_dir" || key == "pem_dir" || key == "active_extra_templates" || key == "ui_group_priority" {
 			continue
 		}
 

diff --git a/pkg/connect/connect.go b/pkg/connect/connect.go
@@ -20,17 +20,21 @@ func (e *ConnectEngine) Start(answerData map[string]interface{}) error {
 	if err != nil {
 		return nil
 	}
-	tmplConfigName, err := utils.PopulateTemplate(tmplData.FilePath, answerData)
+	tmplConfigFilepath, err := utils.PopulateTemplate(tmplData.FilePath, answerData)
+	if err != nil {
+		return nil
+	}
+	tmplConfigFilepath, err = utils.ExpandPath(filepath.Join(e.Config.GetString("options.config_dir"), tmplConfigFilepath))
 	if err != nil {
 		return nil
 	}
-
 	//Print the lines we're running.
 	//Check that the bastion host is accessible.
 
+
 	return syscall.Exec("/bin/bash", []string{"-c",
-		fmt.Sprintf("ssh-add %v; ssh bastion -F %v;",
-			filepath.Join(e.Config.GetString("options.pem_dir"), e.Config.GetString("options.pem_filename")),
-			filepath.Join(e.Config.GetString("options.config_dir"), tmplConfigName)),
+		fmt.Sprintf("ssh bastion -F %v",
+			//filepath.Join(e.Config.GetString("options.pem_dir"), e.Config.GetString("options.pem_filename")),
+			tmplConfigFilepath),
 	}, []string{})
 }