Skip to content

Commit

Permalink
saltstack salt-master review
Browse files Browse the repository at this point in the history
  • Loading branch information
h00die committed Jan 6, 2024
1 parent 47a58bd commit 80e9f1b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Currently only works against nix targets.
### SALT

Location of salt-master executable if not in a standard location. This is added to a list of default locations
which includes `/usr/bin/salt-master`. Defaults to ``
which includes `/usr/bin/salt-master`, `/usr/bin/local/salt-master`. Defaults to ``

### MINIONS

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def initialize(info = {})
)
)
register_options [
OptString.new('SALT', [true, 'salt-master executable location', '/usr/bin/salt-master']),
OptString.new('SALT', [true, 'salt-master executable location', '']),
OptString.new('MINIONS', [true, 'Minions Target', '*']),
OptString.new('WritableDir', [ true, 'A directory where we can write files', '/tmp' ]),
OptString.new('TargetWritableDir', [ true, 'A directory where we can write and execute files on targets', '/tmp' ]),
Expand All @@ -59,7 +59,7 @@ def initialize(info = {})
def salt_master
return @salt if @salt

[datastore['SALT'], '/usr/bin/salt-master'].each do |exec|
[datastore['SALT'], '/usr/bin/salt-master', '/usr/bin/local/salt-master'].each do |exec|
next unless executable?(exec)

@salt = exec
Expand Down

0 comments on commit 80e9f1b

Please sign in to comment.