diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-04-26 11:33:31 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-04-26 11:33:31 +0200 |
| commit | b014bfaadc4104067ff98d0202351625cf03224f (patch) | |
| tree | a38cfbd330f7f0d1c46ceccf33215180a15ef948 /data | |
| parent | 7765d528ce304275350f87c748fa7988ffb4bc26 (diff) | |
| parent | 6a3938cbf595ea24d2d2e3802cf78a0519483339 (diff) | |
| download | vyos-1x-b014bfaadc4104067ff98d0202351625cf03224f.tar.gz vyos-1x-b014bfaadc4104067ff98d0202351625cf03224f.zip | |
Merge branch 'salt' of github.com:c-po/vyos-1x into current
* 'salt' of github.com:c-po/vyos-1x:
salt: T2384: migrate config options
salt: T2385: XML: improve completion helpers on hash_type
salt: T2384: always log to syslog
Revert "salt: T2382: id and master nodes are mandatory - use in verify()"
salt: T2382: ease config generation
salt: T2382: migrate get_config() to list items
salt: T2382: id and master nodes are mandatory - use in verify()
salt: T2382: add missing verify()
salt: T2382: XML: run as user nobody
salt: T2382: XML: add proper valueHelp and validators for master
salt: T2382: add missing dependency on salt-minion
Diffstat (limited to 'data')
| -rw-r--r-- | data/templates/salt-minion/minion.tmpl | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/data/templates/salt-minion/minion.tmpl b/data/templates/salt-minion/minion.tmpl index 5e50d588c..9369573a4 100644 --- a/data/templates/salt-minion/minion.tmpl +++ b/data/templates/salt-minion/minion.tmpl @@ -12,7 +12,7 @@ # # Prior to changing this value, the master should be stopped and all Salt # caches should be cleared. -hash_type: {{ hash_type }} +hash_type: {{ hash }} ##### Logging settings ##### ########################################## @@ -21,11 +21,7 @@ hash_type: {{ hash_type }} # location. Remote logging works best when configured to use rsyslogd(8) (e.g.: # ``file:///dev/log``), with rsyslogd(8) configured for network logging. The URI # format is: <file|udp|tcp>://<host|socketpath>:<port-if-required>/<log-facility> -#log_file: /var/log/salt/minion -#log_file: file:///dev/log -#log_file: udp://loghost:10514 -# -log_file: {{ log_file }} +log_file: file:///dev/log # The level of messages to send to the console. # One of 'garbage', 'trace', 'debug', info', 'warning', 'error', 'critical'. @@ -58,6 +54,6 @@ id: {{ salt_id }} # The number of minutes between mine updates. -mine_interval: {{ mine_interval }} +mine_interval: {{ interval }} verify_master_pubkey_sign: {{ verify_master_pubkey_sign }} |