config: config.yaml: add global "ssh_user" option

This option is used as default value when the host option "ssh_user" is
empty. Like the host option it defaults to an empty value which tells
`ssh` to use the current user.

diff --git a/cmd/safcm/config/config.go b/cmd/safcm/config/config.go
index fafa791144e511e21f83d042cd048f10646ec6b9..74f486e8eb0a802f6a4316358c9d1e36b17e1a79 100644 (file)
--- a/cmd/safcm/config/config.go
+++ b/cmd/safcm/config/config.go
@@ -34,6 +34,8 @@ type Config struct {
 
        DetectGroups  []string `yaml:"detect_groups"`
        GroupPriority []string `yaml:"group_priority"`
+
+       SshUser string `yaml:"ssh_user"`
 }
 
 func LoadConfig() (*Config, error) {

diff --git a/cmd/safcm/sync.go b/cmd/safcm/sync.go
index 0f7c54ff309f360ac0e0bc9cbe4071a467c7c02b..6f38daf37d100713fa00340b4aa54321944cd4a8 100644 (file)
--- a/cmd/safcm/sync.go
+++ b/cmd/safcm/sync.go
@@ -370,7 +370,11 @@ func (s *Sync) Host(wg *sync.WaitGroup) error {
        }()
 
        // Connect to remote host
-       err := conn.DialSSH(s.host.SshUser, s.host.Name, s.config.SshConfig)
+       user := s.host.SshUser
+       if user == "" {
+               user = s.config.SshUser
+       }
+       err := conn.DialSSH(user, s.host.Name, s.config.SshConfig)
        if err != nil {
                return err
        }