2012-03-09 07:47:34 +00:00
|
|
|
publish_port: 64505
|
|
|
|
|
ret_port: 64506
|
2013-08-13 04:33:59 +00:00
|
|
|
worker_threads: 3
|
2012-02-12 07:46:24 +00:00
|
|
|
root_dir: /tmp/salttest
|
2012-03-09 07:47:34 +00:00
|
|
|
pidfile: masterpid
|
|
|
|
|
pki_dir: pki
|
|
|
|
|
cachedir: cache
|
2013-12-17 01:49:08 +00:00
|
|
|
timeout: 3
|
2012-03-09 07:47:34 +00:00
|
|
|
sock_dir: .salt-unix
|
2012-02-12 07:46:24 +00:00
|
|
|
open_mode: True
|
2012-03-29 07:03:11 +00:00
|
|
|
syndic_master: localhost
|
2014-01-09 22:10:42 +00:00
|
|
|
fileserver_list_cache_time: 0
|
2014-10-13 14:58:20 +00:00
|
|
|
pillar_opts: True
|
2012-03-29 00:36:38 +00:00
|
|
|
peer:
|
|
|
|
|
'.*':
|
2012-03-29 00:47:10 +00:00
|
|
|
- 'test.*'
|
2012-08-06 16:58:30 +00:00
|
|
|
log_file: master
|
Reverted back the `--key-logfile` deprecation.
On the parsers cleanup branch, I though about making the available options as equal as possible. Since the log_file setting for the master and the minion could be separately set, I made the logfile option for the key also log_file. Yet, since there's no key specific config file, it shares master, one could only specify the log_file settings from the cli, it could not be hardcoded on the config file, unless, we made a separate config file just for key.
So, in order to reduce required changes, and keep it all as backwards compatible as possible, the key log file options is now, once again, `--key-logfile` which will allow us to hardcode it in the masters config file as `key_logfile`.
This will also, hopefully make travis behave better too.
2012-08-08 00:08:38 +00:00
|
|
|
key_logfile: key
|
2012-10-22 20:43:47 +00:00
|
|
|
token_file: /tmp/ksfjhdgiuebfgnkefvsikhfjdgvkjahcsidk
|
2012-11-09 00:09:38 +00:00
|
|
|
|
2012-11-12 23:20:28 +00:00
|
|
|
file_buffer_size: 8192
|
2013-02-06 19:48:33 +00:00
|
|
|
|
|
|
|
|
ext_pillar:
|
2014-07-01 05:06:18 +00:00
|
|
|
- git: master https://github.com/saltstack/pillar1.git
|
|
|
|
|
- git: master https://github.com/saltstack/pillar2.git
|
2013-10-11 17:53:00 +00:00
|
|
|
- test_ext_pillar_opts:
|
|
|
|
|
- test_issue_5951_actual_file_roots_in_opts
|
2013-05-26 06:31:43 +00:00
|
|
|
|
|
|
|
|
config_opt:
|
|
|
|
|
layer2: 'kosher'
|
2013-12-13 22:20:22 +00:00
|
|
|
yaml_utf8: True
|
2013-12-13 22:36:52 +00:00
|
|
|
|
|
|
|
|
external_auth:
|
2014-06-24 18:17:54 +00:00
|
|
|
pam:
|
2013-12-13 22:36:52 +00:00
|
|
|
saltdev:
|
|
|
|
|
- '@wheel'
|
|
|
|
|
- '@runner'
|
|
|
|
|
- test.*
|
2014-07-15 20:10:14 +00:00
|
|
|
auto:
|
|
|
|
|
saltdev_auto:
|
|
|
|
|
- '@wheel'
|
|
|
|
|
- '@runner'
|
|
|
|
|
- test.*
|
2014-06-25 16:10:12 +00:00
|
|
|
|
|
|
|
|
master_tops:
|
|
|
|
|
master_tops_test: True
|
