Commit Graph

288 Commits

Author SHA1 Message Date
Nicole Thomas
9b42a05519 Added some more docs for master and minion config settings (#33292)
* Added some more docs for master and minion config settings

Configs addressed:
  - auth_safemode
  - auth_timeout
  - conf_file
  - gather_job_timeout
  - jinja_lstrip_blocks
  - jinja_trim_blocks
  - max_event_size

* Change "sub minion" to "sub-minion"
2016-05-17 09:58:20 -07:00
rallytime
fdc877b4dc Document new master and minion config opts for 2016.3.0
Docs were added for:
  - master_tries
  - mine_enabled
  - mine_return_job
  - syndic_failover
  - auth_tries: this is an old setting, but docs were not found
in the minion.rst docs. This change should be added to older branches.
2016-05-16 14:51:13 -06:00
rallytime
cbf42a8407 Merge branch '2016.3' into 'develop'
Conflicts:
  - conf/master
  - doc/ref/configuration/master.rst
  - salt/cli/batch.py
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/minion.py
  - salt/modules/aptpkg.py
  - salt/modules/beacons.py
  - salt/states/archive.py
  - salt/states/cmd.py
  - salt/utils/gitfs.py
  - tests/unit/states/cmd_test.py
2016-04-26 14:42:26 -06:00
Colton Myers
a9770fef24 Add ssh_use_home_key to master config docs/template 2016-04-26 13:53:12 -06:00
rallytime
80fcdfb9d8 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/topics/targeting/grains.rst
  - salt/cli/daemons.py
  - salt/exceptions.py
  - salt/minion.py
  - salt/modules/schedule.py
  - salt/scripts.py
  - salt/states/archive.py
2016-04-26 12:07:42 -06:00
Nicole Thomas
f9ffcb697a [2016.3] Merge forward from 2015.8 to 2016.3 (#32784)
* json encode arguments passed to an execution module function call

this fixes problems where you could pass a string to a module function,
which thanks to the yaml decoder which is used when parsing command line
arguments could change its type entirely. for example:

__salt__['test.echo')('{foo: bar}')

the test.echo function just returns the argument it's given. however,
because it's being called through a salt-call process like this:

salt-call --local test.echo {foo: bar}

salt thinks it's yaml and therefore yaml decodes it. the return value
from the test.echo call above is therefore a dict, not a string.

* Prevent crash if pygit2 package is requesting re-compilation of the e… (#32652)

* Prevent crash if pygit2 package is requesting re-compilation of the entire library on production systems (no *devel packages)

* Fix PEP8: move imports to the top of the file

* Move logger up

* Add log error message in case if exception is not an ImportError

* align OS grains from older SLES with current one (#32649)

* Fixing critical bug to remove only the specified Host instead of the entire Host cluster (#32640)

* yumpkg: Ignore epoch in version comparison for explict versions without an epoch (#32563)

* yumpkg: Ignore epoch in version comparison for explict versions without an epoch

Also properly handle comparisions for packages with multiple versions.

Resolves #32229

* Don't attempt downgrade for kernel and its subpackages

Multiple versions are supported since their paths do not conflict.

* Lower log level for pillar cache (#32655)

This shouldn't show up on salt-call runs

* Don't access deprecated Exception.message attribute. (#32556)

* Don't access deprecated Exception.message attribute.

To avoid a deprecation warning message in logs.
There is a new function salt.exceptions.get_error_message(e) instead.

* Fixed module docs test.

* Fix for issue 32523 (#32672)

* Fix routes for redhat < 6

* Handle a couple of arguments better (Azure) (#32683)

* backporting a fix from develop where the use of splay would result in seconds=0 in the schedule.list when there was no seconds specified in the origina schedule

* Handle when beacon not configured and we try to enable/disable them (#32692)

* Handle the situation when the beacon is not configured and we try to disable it

* a couple more missing returns in the enable & disable

* Check dependencies type before appling str operations (#32693)

* Update external auth documentation to list supported matcher. (#32733)

Thanks to #31598, all matchers are supported for eauth configuration.
But we still have no way to use compound matchers in eauth configuration.
Update the documentation to explicitly express this limitation.

* modules.win_dacl: consistent case of dacl constants (#32720)

* Document pillar cache options (#32643)

* Add note about Pillar data cache requirement for Pillar targeting method

* Add `saltutil.refresh_pillar` function to the scheduled Minion jobs

* Minor fixes in docs

* Add note about relations between `pillar_cache` option and Pillar Targeting
to Master config comments with small reformatting

* Document Pillar Cache Options for Salt Master

* Document Minions Targeting with Mine

* Remove `saltutil.refresh_pillar` scheduled persistent job

* Properly handle minion failback failure. (#32749)

* Properly handle minion failback failure.

Initiate minion restart if all masters down on __master_disconnect like
minion does on the initial master connect on start.

* Fixed unit test

* Improve documentation on pygit2 versions (#32779)

This adds an explanation of the python-cffi dep added in pygit2 0.21.0,
and recommends 0.20.3 for LTS distros. It also links to the salt-pack
issue which tracks the progress of adding pygit2 to our Debian and
Ubuntu repositories.

* Pylint fix
2016-04-25 15:26:09 -06:00
Brad Thurber
8d7148d41b Catch up the conf/master file to include gitfs/git_pillar parms from recent releases 2016-04-22 13:34:21 -06:00
Denys Havrysh
3751a270d7 Document pillar cache options (#32643)
* Add note about Pillar data cache requirement for Pillar targeting method

* Add `saltutil.refresh_pillar` function to the scheduled Minion jobs

* Minor fixes in docs

* Add note about relations between `pillar_cache` option and Pillar Targeting
to Master config comments with small reformatting

* Document Pillar Cache Options for Salt Master

* Document Minions Targeting with Mine

* Remove `saltutil.refresh_pillar` scheduled persistent job
2016-04-22 08:54:30 -06:00
Brad Thurber
fcd590291b Catch up the conf/master file to include gitfs/git_pillar parms from recent releases 2016-04-20 15:06:44 -04:00
Nicole Thomas
216d9fdc9a [develop] Merge forward from 2016.3 to develop (#32494)
* fix sorting by latest version when called with an attribute

* remove reference to master_alive_check

* Fixes saltstack/salt#28262

* Resolve memory leak in authentication

* outputter virt_list does not exist anymore

* Update proxmox documentation

* Fix documentation on boto_asg and boto_elb modules and states

* modules.win_timezone: don't list all zones in debug log

* Correcty index glusterfs bricks

Fixes issue #32311

* Cleaner deprecation process with decorators

* Add deprecation decorator scaffold

* Capture type error and unhandled exceptions while function calls

* Aware of the current and future version of deprecation

* Implement initially is_deprecated decorator

* Add an alias for the capitalization

* Fix capitalization easier way

* Remove an extra line

* Add successor name to the deprecation decorator.

* Granulate logging and error messages.

* Implement function swapper

* Raise later the caught exception

* Clarify exception message

* Save function original name

* Remove an extra line

* Hide an alternative hidden function name in the error message, preserving the error itself

* Rename variable as private

* Add a method to detect if a function is using its previous version

* Message to the log and/or raise an exception accordingly to the status of used function

* Log an error along with the exception

* Add internal method documentation

* Add documentation and usage process for decorator "is_deprecated"

* Add documentation and process usage for the decorator "with_deprecated"

* Hide private method name

* Fix PEP8, re-word the error message

* Deprecate basic uptime function

* Add initial decorator unit test

* Rename old/new functions, mock versions

* Move frequent data to the test setup

* Add logging on EOL exception

* Rename and document high to low version test on is_deprecated

* Implement a test on low to high version of is_deprecated decorator

* Add a correction to the test description

* Remove a dead code

* Implement a test for high to low version on is_deprecated, using with_successor param

* Correct typso adn mistaeks

* Implement high to low version with successor param on is_deprecated

* Setup a virtual name for the module

* Implement test for with_deprecated should raise an exception if same deprecated function not found

* Implement test for with_deprecated an old function is picked up if configured

* Correct test description purpose

* Implement test with_deprecated when no deprecation is requested

* Add logging test to the configured deprecation request

* Add logging testing when deprecated version wasn't requested

* Implement test EOL for with_deprecated decorator

* Correct test explanation

* Rename the test

* Implement with_deprecated no EOL, deprecated other function name

* Implement with_deprecated, deprecated other function name, EOL reached

* Add test description for the with_deprecated + with_name + EOL

* Fix confusing test names

* Add logging test to the is_deprecated decorator when function as not found.

* Add more test point to each test, remove empty lines

* Bugfix: at certain conditions a wrong alias name is reported to the log

* Fix a typo in a comment

* Add test for the logging

* Disable a pylint: None will _never_ be raised

* Fix test for the deprecated "status.uptime" version

* Bugfix: Do not yank raised exceptions

* Remove unnecessary decorator

* Add test for the new uptime

* Add test for the new uptime fails when /proc/uptime does not exists

* Rename old test case

* Skip test for the UTC time, unless freeze time is used.

* Fix pylint

* Fix documentation

* Bugfix: proxy-pass the docstring of the decorated function

* Lint fix

* Fixes saltstack/salt#28262 for 2015.5 branch

* Update master config docs

* Improve git_pillar documentation/logging

* Add note about different behavior of top file in git_pillar

* Make log entry for a missing pillar SLS file more accurate for git_pillar

* FreeBSD supports packages in format java/openjdk7 so the prior commit broke that functionality. Check freebsd/pkg#1409 for more info.

* FreeBSD supports packages in format java/openjdk7 so the prior commit broke that functionality. Check freebsd/pkg#1409 for more info.

* Update glusterfs_test to be inline with #32312

* Fix salt-cloud paralell provisioning

Closes #31632

* Ignore Raspbian in service.py __virtual__ (#32421)

* Ignore Raspbian in service.py __virtual__

This prevents more than one execution module from trying to load as the
service virtual module.

Refs: #32413

* pack __salt__ before loading provider overrides

We can (and should) pack here since we're just packing a reference to the
object. __salt__ needs to be available when we're loading our provider
overrides

* Fix broken __salt__ dict in provider override

Using ret.items() here sets ``__salt__`` to its items (tuple containing
function name and reference), breaking usage of ``__salt__`` inside
overridden functions.

* Merge #32293 with test fixes (#32418)

* Fix issue #11497

* Remove check for working directory presence in tests

* Fix Domainname introspection

Default value needs to be extracted from the container itself,
because dockerd set Domainname value when network_mode=host.

* Add pgjsonb_queue to queue doc index

* Pylint fixes

* Pass parser options into batch mode

Resolves #31738

* Changed the target file in file.symlink test (#32443)

* Argument name in docs should match actual arg name (#32445)

Fixes #31851

* tests.integration: bypass MacOS TMPDIR, gettempdir (#32447)

Updates 0edd532, 8f558a5.

When logging in as root over `ssh root@host`, `$TMPDIR` and
`tempfile.gettempdir()` are both set to a variation of:
```
/private/var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/
```
When logging in as root over `sudo -i`, `$TMPDIR` is unset and
`tempfile.gettempdir()` is set to `/tmp`.

My guess is that the second case is an unintended or uncorrected omision
by Apple as they have introduced the longer, randomized temp path in a
recent version of MacOS.

* Issue #28706: Fix state user.present behavior. (#32448)

- As mentionned in issue #28706, state user.present no longer remove
      user from groups if the keyword 'groups' with empty value '[]' is not
      explicitly set, salt will assume current groups are still wanted.

* tests.integration: fix 4230c8a

* Move the tables of virtual modules to individual documentation pages

* Add new doc pages to toctree

* Add external ref to windows package manager docs

* Improve docstrings

* Add documentation on virtual module provider overrides to the module docs

* Clarify the scope of the provider param in states.

* Add link to provider override docs to all package providers

* Add link to provider override docs to all service providers

* Add link to provider override docs to all user providers

* dd link to provider override docs to all shadow providers

* Add link to provider override docs to all group providers

* Backport 31164 and 31364 (#32474)

* Don't send REQ while another one is waiting for response.

The message has to be removed from the queue the only *after* it's
already processed to don't confuse send() functionality that expects
empty queue means: there's no active sendings.

* Fixed zeromq ReqMessageClient destroy

* Add link to provider override docs to opkg.py

This is a companion to https://github.com/saltstack/salt/pull/32458, but
this module was not added until the 2016.3 branch, so the documentation
is being updated there for this module.

* Add documentation for some master/minion configs (#32454)

Refs #32400

Adds docs for:

- cli_summary
- event_return_queue
- event_return_whitelist
- event_return_blacklist
- file_recv_max_size
- fileserver_followsymlinks
- fileserver_ignoresymlinks
- fileserver_limit_traversal

* Automatically detect correct MySQL password column for 5.7 and fix setting passwords (#32440)

* Automatically detect MySQL password column

* Fix changing password in MySQL 5.7

* Fix lint test

* Fix unit tests (?)

They will still fail if "authentication_string" is legitimately the right column name, but I don't know what to do about that.

* Additional unit test fix

* Only unsub if we have a jid

Closes #32479
2016-04-11 17:07:15 -06:00
rallytime
4f03f2311f Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cli/salt.py
  - salt/modules/win_pkg.py
  - salt/transport/tcp.py
2016-04-11 14:33:21 -06:00
rallytime
1b04f0ddec Merge branch '2015.5' into '2015.8'
Conflicts:
  - doc/ref/configuration/minion.rst
  - doc/ref/modules/all/index.rst
  - doc/ref/modules/index.rst
  - salt/modules/systemd.py
  - salt/modules/zypper.py
2016-04-11 11:33:08 -06:00
Nicole Thomas
29333e533e Add documentation for some master/minion configs (#32454)
Refs #32400

Adds docs for:

- cli_summary
- event_return_queue
- event_return_whitelist
- event_return_blacklist
- file_recv_max_size
- fileserver_followsymlinks
- fileserver_ignoresymlinks
- fileserver_limit_traversal
2016-04-11 10:49:52 -06:00
rallytime
308aa5fd61 Merge branch '2016.3' into 'develop'
Conflicts:
  - conf/master
  - conf/minion
  - doc/ref/proxy/all/index.rst
  - salt/cli/daemons.py
  - salt/modules/key.py
  - salt/modules/reg.py
  - salt/modules/win_pkg.py
  - salt/utils/__init__.py
  - salt/utils/cloud.py
  - tests/unit/daemons_test.py
2016-03-18 10:57:15 -06:00
SaltyCharles
d6f6ca1ce7 fix typos in master config 2016-03-17 17:02:50 -07:00
rallytime
838dc12b77 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/exceptions.py
  - salt/pillar/foreman.py
  - salt/returners/local_cache.py
  - salt/states/saltmod.py
  - salt/utils/__init__.py
  - salt/utils/cloud.py

The merge conflicts in salt/cli/daemons.py are still present in this commit.
@s0undt3ch is going to resolve them after this commit.
2016-03-08 10:14:32 -07:00
Bo Maryniuk
95cb59dec7 Set defalt hash as SHA1 in config and explain why. 2016-03-03 21:41:08 +01:00
Bo Maryniuk
f276441ae8 Suggest hash SHA256 in the configs as a defaut and explain why. 2016-03-03 10:17:10 +01:00
rallytime
031a75ca33 Merge branch '2015.8' into '2016.3'
Conflicts:
  - Contributing.rst
  - conf/master
  - doc/index.rst
  - doc/man/salt.7
  - pkg/suse/README.suse
  - salt/client/ssh/state.py
  - salt/minion.py
  - salt/modules/zypper.py
  - salt/utils/schedule.py
  - tests/unit/modules/zypper_test.py
2016-03-02 10:26:13 -07:00
Denys Havrysh
7eaf778695 Remove trailing white spaces in conf dir file 2016-03-01 17:35:34 +02:00
Colton Myers
076b49a4ca Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3
Conflicts:
    README.rst
    doc/conf.py
    doc/ref/index.rst
    doc/ref/proxy/all/salt.proxy.ssh_sample.rst
    doc/topics/installation/rhel.rst
    doc/topics/releases/2015.8.4.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/opennebula.py
    salt/config/__init__.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_ec2.py
    salt/modules/boto_elasticache.py
    salt/modules/boto_elb.py
    salt/modules/boto_iam.py
    salt/modules/boto_rds.py
    salt/modules/boto_sns.py
    salt/modules/boto_sqs.py
    salt/modules/dracr.py
    salt/modules/git.py
    salt/modules/mine.py
    salt/modules/systemd.py
    salt/modules/win_pkg.py
    salt/modules/yumpkg.py
    salt/pillar/__init__.py
    salt/states/git.py
    salt/states/rabbitmq_vhost.py
    salt/states/saltmod.py
    salt/utils/pkg/rpm.py
    setup.py
    tests/unit/modules/systemd_test.py
    tests/unit/states/rabbitmq_vhost_test.py
2016-02-11 22:33:49 -07:00
Mike Place
4372851ad9 Merge pull request #30895 from bdrung/2015.8
Fix various typos
2016-02-04 13:55:10 -07:00
Denys Havrysh
ca8c0bdc3f Update nodegroups section example in master config according to docs 2016-02-04 13:52:56 +02:00
Benjamin Drung
bf92c3663b Fix typo formating -> formatting 2016-02-04 12:45:19 +01:00
Mike Place
02d8ff626a Pillar cache for master
Entry point for pillar cache

Working msgpack implementation along with in-memory

Remove debugging

Perms for pillar cache creation

Documentation and small typo fix

Additional documentation note in master config

A note on pillar caching in the documentation on scaling

Backport of pillar cache to 2015.8 branch

Fixed ext pillar with debug

Lint
2016-01-28 09:44:29 -06:00
Sean Jenkins
9665d9655f Set (pillar_)merge_lists to default for PR#30062 2016-01-19 15:06:50 -07:00
Sean Jenkins
e44a30620b Remove recurse_list from pillar_source_merging_strategy and add pillar_merge_list (bool) instead 2016-01-19 15:06:30 -07:00
Thayne Harbaugh
460a3c98cc Additional corrections to use option defaults directly from salt.config
* correct 'id' entry in salt.config
  * add 'event_match_type' in salt.config
  * ensure that hash is only calculated in minion since it isn't needed by the master

Conflicts:
	salt/config.py
2016-01-13 21:44:06 +00:00
Thayne Harbaugh
8ef6d6c6fd Add additional ZMQ tuning parameters necessary for 1,000+ minions per server.
Start collecting tuning parameters together in the master config file.
2016-01-13 09:34:29 -07:00
Sean Jenkins
8fc656b6f2 Set (pillar_)merge_lists to default for PR#30062 2016-01-06 09:55:20 -07:00
Sean Jenkins
41353b7ab3 Remove recurse_list from pillar_source_merging_strategy and add pillar_merge_list (bool) instead 2015-12-29 10:22:54 -07:00
Dmitry Kuzmenko
7a5204ef02 Deprecate client_acl with publisher_acl (rename)
Keeping client_acl support
2015-10-23 11:59:40 +03:00
Thayne Harbaugh
625a129445 Additional corrections to use option defaults directly from salt.config
* correct 'id' entry in salt.config
  * add 'event_match_type' in salt.config
  * ensure that hash is only calculated in minion since it isn't needed by the master
2015-10-21 22:15:13 -06:00
Mike Place
1f8d65c402 Merge pull request #27606 from plastikos/bug-scaling_zmq_hwm
RFC: Add additional ZMQ tuning parameters necessary for 1k+ minions per master [WIP]
2015-10-16 10:03:56 -06:00
Jacob Hammons
5a9867aad1 initial engines topic, updates to windows repo docs
Refs #23239
Refs #27520
2015-10-05 14:22:59 -06:00
Thayne Harbaugh
2fe799dd0a Add additional ZMQ tuning parameters necessary for 1,000+ minions per server.
Start collecting tuning parameters together in the master config file.
2015-10-01 14:52:18 -06:00
Colton Myers
2c2a5f85ac Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/conf.py
    doc/topics/cloud/gce.rst
    salt/cli/api.py
    salt/cli/call.py
    salt/cli/cp.py
    salt/cli/key.py
    salt/cli/run.py
    salt/cli/salt.py
    salt/modules/dockerio.py
    salt/states/dockerio.py
2015-09-17 10:54:33 -06:00
Colton Myers
66f4641be3 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
Conflicts:
    doc/conf.py
    salt/__init__.py
    salt/cli/__init__.py
2015-09-16 18:39:16 -06:00
Mike Place
507fb04683 Issue warning that some log levels may contain sensitive data 2015-09-14 15:39:17 -06:00
Colton Myers
274464a85b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/topics/reactor/index.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/modules/groupadd.py
    salt/modules/localemod.py
    salt/modules/mysql.py
    salt/modules/useradd.py
    salt/modules/win_pkg.py
    salt/modules/win_useradd.py
    salt/netapi/rest_cherrypy/app.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/htpasswd.py
    salt/states/user.py
2015-09-14 14:39:03 -06:00
Jacob Hammons
2401533d9e New content added to beacon docs. 2015-09-09 11:16:55 -06:00
Justin Findlay
559512b0a6 add default_top description to docs 2015-08-26 01:44:33 -06:00
Mike Place
a5522f1581 Removed incorrect default config 2015-08-11 11:29:06 -06:00
Mike Place
cfb6982227 Adding some dictupdate merge tests
Add new option for top_file_merging_strategy to config

Add master config file option

Adding additional tests

Lexicographical test works

Make default strategy

Simplify to just an option about whether or not to merge

Changes

Implement ordered top files

Implement merge strategies and default top files

Lint

Doc rewrite and start on ordering

Remove debugging

Moving to env_order

Adding env_order

Still writing tests

More tests and docs
2015-08-11 11:28:40 -06:00
Colton Myers
f4cb659a2a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/topics/windows/windows-package-manager.rst
    salt/modules/event.py
    salt/returners/carbon_return.py
    salt/state.py
    salt/states/pkg.py
2015-08-03 14:50:50 -06:00
Jacob Hammons
3f3db4bd8e Additions for #24042 2015-07-30 15:43:21 -06:00
Jacob Hammons
db2129b199 Minor doc bug fixes
Refs #24042
Refs #25650
Refs #21296
Refs #23788
2015-07-30 14:39:15 -06:00
Justin Findlay
d73964ea3c add console_log_fmt color documentation 2015-07-28 16:16:29 -06:00
Colton Myers
2ae0d7d302 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    salt/modules/win_file.py
2015-06-16 15:13:53 -06:00
Mike Place
b7bb7eaeb2 Note about minimum worker_threads 2015-06-15 11:43:14 -06:00
Colton Myers
ece63c36a3 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    doc/topics/ssh/roster.rst
    salt/modules/win_groupadd.py
2015-05-06 15:49:50 -06:00
Colton Myers
2981aed48e Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-05-05 16:49:31 -06:00
Colton Myers
fd09cdae6f Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
    doc/topics/ssh/roster.rst
    salt/client/ssh/__init__.py
    salt/client/ssh/wrapper/__init__.py
    salt/config.py
    salt/modules/file.py
    salt/runners/lxc.py
2015-05-05 16:26:39 -06:00
Colton Myers
87fc3161f9 Add Salt-SSH section to master config template 2015-05-04 15:05:12 -06:00
Steve Weber
36b1c87dd2 include module_dirs
include module_dirs because its more flexible than extension_modules.
2015-05-04 12:53:50 -04:00
Mike Place
3bc74501e4 Document many core opts
Although these are documented in other places, we need somewhere that we
can store more in-depth, interface-specific information about various options.

This way, we can make implementation-specific comments which would not be approrpiate
for user configuration files.
2015-04-03 17:17:06 -06:00
Nicole Thomas
44c7eb4d4b Merge pull request #22169 from basepi/merge-forward-develop
Merge forward from 2015.2 to develop
2015-03-31 09:21:36 -06:00
Colton Myers
124ad51c40 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    doc/ref/index.rst
    doc/topics/eauth/index.rst
    salt/beacons/__init__.py
    salt/beacons/service.py
    salt/loader.py
    salt/minion.py
    salt/output/nested.py
2015-03-30 15:10:17 -06:00
Justin Findlay
294dfe2d94 clarify and expand console log colors help 2015-03-26 23:21:30 -06:00
Colton Myers
7ba2404cc9 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
    conf/master
    conf/minion
    doc/ref/configuration/master.rst
    salt/loader.py
    salt/minion.py
    salt/modules/ssh.py
    salt/output/nested.py
    salt/utils/network.py
2015-03-25 09:28:04 -06:00
rallytime
609dcdbac1 Add default for pillar_source_merging_strategy in conf/master file
Fixes #21511
2015-03-24 14:53:18 -06:00
C. R. Oldham
a35f38a71e Clarify how defaults are indicated in the config files. 2015-03-24 12:27:51 -06:00
C. R. Oldham
5dbb0d433d Clarify how defaults are indicated in the config files. 2015-03-24 12:10:01 -06:00
Colton Myers
d17c908b42 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
	doc/topics/pillar/index.rst
	salt/beacons/diskusage.py
	salt/beacons/network_info.py
	salt/minion.py
	salt/modules/iptables.py
	salt/modules/nacl.py
	salt/modules/win_firewall.py
2015-03-09 12:52:14 -06:00
s8weber
ad869c74b1 add pillar_safe_render_error config
allow a salt admin to config if the detailed render error of pillars
can be passed to the minion.
2015-03-04 10:22:29 -05:00
Justin Findlay
e8d4882c0a remove misleading unicode message 2014-12-27 17:38:05 -07:00
Justin Findlay
2d93867c3e add color to console logger 2014-12-27 13:36:57 -07:00
Thomas S Hatch
1dcc05b049 Merge branch '2014.7' into develop
Conflicts:
	salt/modules/yumpkg.py
2014-12-17 15:00:26 -07:00
Seth House
7ce1becf34 Added note about using log_level_logfile with log_granular_levels 2014-12-16 18:18:21 -07:00
Seth House
90edd2185b Removed trailing comma from log_granular_levels example; is invalid YAML
Thanks to F. Langelier for the report.
2014-12-16 18:13:07 -07:00
Thomas S Hatch
fc8535e09f Merge pull request #18702 from wolfpackmars2/patch-1
Propose update to master config file
2014-12-04 16:41:43 -07:00
Colton Myers
472f6577e2 Merge branch '2014.7' into merge-forward
Conflicts:
	salt/minion.py
	salt/modules/localemod.py
	salt/states/mount.py
	salt/transport/__init__.py
	salt/utils/schedule.py
2014-12-04 11:11:11 -07:00
Joseph Hall
85bdf64ecb Merge pull request #18677 from QthCN/develop
Add Returner Setting section for returner's config
2014-12-04 05:49:44 -07:00
Steve Groesz
b65e12e790 Propose update to master config file
Per the documentation: http://docs.saltstack.com/en/latest/ref/configuration/master.html#include-configuration  the include directive is unset by default.  As documented at the top of the master config file: "Values that are commented out but have no space after the comment are defaults that need not be set in the config. If there is a space after the comment that the value is presented as an example and is not the default."  Therefore, I propose adding a space after the comment to clarify that this is an example directive and not the default.
2014-12-03 21:12:13 -06:00
QthCN
1f6bb0a012 Add Returner Setting section for returner's config 2014-12-04 00:12:37 +08:00
Seth House
aa964e5d3c Added state_aggregate placeholders to the master/minion conf files 2014-12-02 18:33:10 -05:00
Mike Place
b0a3d2b87b Event return filtering 2014-12-01 13:05:21 -07:00
Mike Place
8877ba7d78 Ability to queue event returns 2014-12-01 11:46:27 -07:00
Mike Place
5594be2708 Now fires events to specified returner 2014-11-26 16:31:44 -07:00
Mike Place
36017c0911 Configuration gate 2014-11-26 15:37:01 -07:00
Damian Myerscough
3ed419288a sudo_client acl directive 2014-11-17 14:13:06 -08:00
David Boucha
6406078240 pillar_opts defaults to False in develop now 2014-10-17 10:18:59 -06:00
Mike Place
a4c524176f Flag to preserve minion cache on key delete
Refs #15673
2014-10-03 13:29:41 -06:00
Mike Place
5f2103903d Flag to preserve minion cache on key delete
Refs #15673
2014-10-03 11:43:33 -06:00
Colton Myers
11ddb3874b Merge branch '2014.7' into develop
Conflicts:
	conf/master
	conf/minion
2014-09-26 17:46:10 -06:00
rallytime
4402fd80fb Clean up formatting of minion stock conf file 2014-09-26 15:38:49 -06:00
rallytime
33369370d9 Clean up formatting of master stock conf file 2014-09-26 15:15:40 -06:00
Colton Myers
99e97320e1 Merge branch '2014.7' into develop
Conflicts:
	doc/ref/configuration/minion.rst
	doc/ref/states/requisites.rst
	doc/topics/troubleshooting/master.rst
	doc/topics/tutorials/index.rst
	doc/topics/tutorials/intro_scale.rst
	salt/config.py
	salt/key.py
	salt/master.py
	salt/minion.py
	salt/modules/file.py
	salt/modules/hashutil.py
	salt/modules/lxc.py
	salt/modules/oracle.py
	salt/modules/tls.py
	salt/modules/win_update.py
	salt/pillar/pepa.py
	salt/pillar/s3.py
	salt/states/augeas.py
	salt/states/win_update.py
	salt/tops/ext_nodes.py
	salt/utils/master.py
2014-09-22 14:22:54 -06:00
Mike Place
53445d607b Copy con_cache doc into master conf.
Refs PR #15918
2014-09-18 09:23:27 -06:00
Mike Place
50579b31cd Set default to false 2014-09-17 14:38:42 -06:00
Mike Place
0a4b370bc7 Add note about large install to config file 2014-09-15 12:42:59 -06:00
Mike Place
305956c539 Fire an event on AES key rotate.
Also setup a config file option for ping-on-rotate.
2014-09-15 11:39:58 -06:00
Thomas S Hatch
39b107a283 Merge pull request #14820 from steverweber/add_conf_help
show_timeouts, new default
2014-09-02 12:13:31 -06:00
Scott Coil
6770ce314e add ability to target pillar from ext pillar 2014-08-31 16:46:22 -05:00
Seth House
4abc45397d Merge remote-tracking branch 'upstream/2014.7' into develop 2014-08-21 13:23:52 -06:00
Mike Place
94543fe68d Document seco range
Per request in #15093
2014-08-20 11:54:29 -06:00
steve
d13c7275a7 show_timeouts, new default 2014-08-14 13:10:52 -04:00
Chris Rebert
177c168a21 Fix numerous typos found via Lintian
Thanks https://github.com/Debian/lintian/tree/master/data/spelling !
2014-08-11 10:46:43 -07:00
rallytime
f0d9db2497 Removed the term "Hydrogen" from versionadded notation 2014-07-01 15:01:12 -06:00
Mathieu Le Marec - Pasquet
da758409d4 make color stripping configurable 2014-06-20 09:53:28 +02:00
Cowyn Li
9436dbd84c Provide a reasonable sample path for autoreject_file without confusion 2014-06-17 19:01:31 +08:00
steverweber
84bfe9ce18 auto accept keys in minions_autosign
Accept keyids if a file with the same name is found in minions_autosign.
Also option to check the datestamp of the file and only accept if within timeout.
2014-05-12 19:56:39 -04:00
Mike Place
79a758e3aa Raise max to 1 MiB.
Otherwise, the loader will tank.
2014-04-29 17:09:14 -06:00
Mike Place
0b1da0dd84 Use KiB 2014-04-29 17:09:14 -06:00
Mike Place
97598126a3 Max message size for event bus.
Closes #11372
2014-04-29 17:09:14 -06:00
Mike Place
756b0e386b Remove hard-coded MD5 wherever possible.
Doing so helps Salt to achieve FIPS compliance. Closes #11486 and #7318.
2014-04-07 14:14:19 -06:00
Tom Atkinson
72e76efeb5 Document the changes setting for state_output in default master conf file 2014-04-07 17:26:07 +02:00
Jens Rantil
347c0ae5f1 fix(config/master): typo 2014-03-14 11:16:36 +01:00
Seth House
a06ccfef2f Added docs for the extension_modules setting
Refs #11030
2014-03-07 15:13:41 -08:00
Colton Myers
cd9480c261 Clarify the actions salt will take when run as non-root
Ref #10433

Also fix a dangling preposition
2014-02-14 14:52:19 -07:00
Erik Johnson
fa468c3797 Fix typo in master config file
Resolves #10144.
2014-02-03 14:12:21 -06:00
Thomas S Hatch
962fc36936 autoreject is the config value 2014-01-11 13:26:33 -07:00
Erik Johnson
d5440647d4 Add gitfs_provider to master config file template
Also moved a paragraph that seemed to be out of place
2014-01-03 20:57:25 -06:00
Thomas S Hatch
b3b6c0bcee Merge pull request #8734 from terminalmage/autoreject_file
add an autoreject_file parameter to the master config file
2013-12-30 09:24:03 -08:00
C. R. Oldham
d9d359ba05 Enable cryptographic signing of messages published from the master. 2013-12-11 13:47:47 -07:00
Thomas S Hatch
4bffa13abf Merge pull request #9108 from pakdel/file_recv_max_size
Added an option to limit maximum size of a file that can be pushed to master by files_recv
2013-12-09 10:34:06 -08:00
Amir Pakdel
49141cf042 file_recv_max_size config is specified in megabyte 2013-12-09 10:50:52 -05:00
Thomas S Hatch
fa1c9c4401 Disable fileserver events by default
@jacksontj, this turns off these event by default and you will
need to set this flag in your config in the future
2013-12-08 22:46:36 -07:00
Amir Pakdel
c934a9bd36 Added an option to limit max size in files_recv
The default is set to 100MB, which means pushing
larger files will stop when reaches this limit.
This limit can be adjusted by file_recv_max_size
option in the master's config file.
2013-12-08 15:01:20 -05:00
Jorge-Rodriguez
25573412d4 Added ssl verify flag to the gitfs backend. 2013-12-03 09:54:47 +02:00
Jorge-Rodriguez
ddf4c6dbe2 Added SSL verify flag for pillar git backend, in case getting around
self-signed certificates is needed.
2013-12-02 10:40:11 +02:00
Erik Johnson
e9eae00028 Add autoreject_file to master config template 2013-11-21 17:12:10 -06:00
C. R. Oldham
236a1656d3 Implement #8333 2013-11-08 13:29:47 -07:00
Mike Place
459feb70f3 Provide a configuration switch to enable limited directory traversal. 2013-10-31 17:07:02 -06:00
Mike Place
5aa4691a09 New configuration option to disable lspci queries for GPU data on master. 2013-10-22 14:36:13 -06:00
Mickey Malone
2675f34079 Added more symlink funtionality
Cleaned up some of the comments/doc language
2013-09-25 22:21:27 -05:00
Mickey Malone
84fee92e72 Merge remote-tracking branch 'upstream/develop' into develop 2013-09-24 21:37:47 -05:00
Mickey Malone
1be07f2ff0 Added some more documentation to fileserver_followsymlinks 2013-09-24 21:36:16 -05:00
mlister2006
2ecaddb484 Adding master side acl support for mine.get 2013-09-23 12:00:19 -04:00
Mickey Malone
105806ead3 Added ignore symlink option. Cleaned up roots. 2013-09-20 20:25:48 -05:00
Mickey Malone
237adbf3e6 Made roots fileserver backend symlink traversal configureable 2013-09-20 12:47:05 -05:00
Erik Johnson
46d68c8669 Fix inconsistent indentation in config file templates
In the config file templates, some parameters are commented out with a
pound sign, and others are commented out using a pound sign and a space.
This has led to some confusion when people uncomment some params to use
them and then there are errors when PyYAML tries to render the data.

This commit makes the commenting of config parameters uniform, using
just a pound sign with no extra space.
2013-09-13 16:32:21 -05:00
micahhausler
b27bb8b1c1 Fixed #6803 -- Added example to ignore serving vim swapfiles 2013-09-06 15:01:23 -04:00
Jason Sommer
201b4f8776 Added gitfs_root option 2013-08-17 20:14:57 -05:00
Erik Johnson
b9ae4a636e Add file_recv option to config file template 2013-08-08 15:10:11 -05:00
Erik Johnson
15640a70c6 Grammar cleanup 2013-08-03 18:51:37 -05:00
Mathieu Le Marec - Pasquet
cff1fa6f53 fix/feat: let the syndic be way more configurable
- Fix micmac between configs
- Add options to configure pidfile, logfile, masterofmaster port

This fixes #6024.
2013-07-15 20:30:26 +00:00
Daniel Naegele
daa4007d78 quickfix for IPv6, added basic documentation to the default configs 2013-06-18 02:04:17 +02:00
Colton Myers
cbd6492950 Add docs for file:// in gitfs 2013-05-07 11:21:26 -06:00
Colton Myers
9a2c99419d Add docs for state_output: 'mixed' 2013-05-06 15:40:13 -06:00
Colton Myers
9bb9be8f46 Remove rogue tabs and trailing whitespace in conf/master 2013-02-25 11:46:27 -07:00
Sean Channel
13c6569269 local repo git example 2013-02-12 10:12:25 -08:00
John Albietz
cbca0ac09d updated formatting for consistency. typos fixed.
tried to remove some redundant language also.
2013-02-11 18:40:00 -08:00
David Boucha
46fcbd7100 Add comment about client_acl_blacklist 2013-02-11 16:41:27 -07:00
Sean Channel
883600fc2e comment out for issue #3661 2013-02-11 14:46:54 -08:00
Thomas Jackson
8cd53c3ecc Initial add of client_acl_blacklist (#3450)
This feature allows you to blacklist users (regex) and modules (regex)
2013-02-07 10:49:31 -08:00
Thomas S Hatch
7b1d9d9330 Add loop_interval to default master config 2013-01-14 01:21:28 -07:00
Thomas S Hatch
4e0f2f2110 Add color value to the default config 2013-01-10 18:15:05 -07:00
Thomas S Hatch
eb582dee60 Add output option to default master config 2013-01-10 18:12:11 -07:00
Sean Channel
c363fbe690 localhost -> loghost 2013-01-10 16:59:24 -08:00