valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,418 Commits 24 Branches 182 Tags 341 MiB
2c8f817654
Commit Graph

5418 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
2c8f817654 Merge pull request #1609 from bretep/sysconfig_network 
Sysconfig network
 2012-07-10 21:45:19 -07:00
Bret Palsson
fa6d36b6cd Keep things consistent 2012-07-10 22:23:37 -06:00
Bret Palsson
28e3b94f26 Add support to global networking config 
Added support for the following:
- nozeroconf
Where setting true disables the zeroconf route.
By default, the zeroconf route (169.254.0.0) is enabled when the system boots. For more information about zeroconf, refer to http://www.zeroconf.org/

- nisdomain:
The NIS domain name.
 2012-07-10 22:16:25 -06:00
Thomas S Hatch
d0089b2296 Merge pull request #1607 from jagster02/develop 
Fixes syndic init failure due to cli attribute error
 2012-07-10 18:45:18 -07:00
Thomas S Hatch
36e3ac0559 Merge pull request #1606 from jagster02/develop 
salt-syndic exec script instantiates a minion rather than a syndic
 2012-07-10 18:34:05 -07:00
E.G. Galano
7ee5c07f42 Fixes syndic init failure due to cli attribute error introduced in commit: 3f6b4ac7b8 2012-07-10 18:31:28 -07:00
E.G. Galano
ed4658a7a4 Change salt-syndic exec script to instantiate a syndic class rather than a minion. Fixing the bug introduced in ee0072d3e8 2012-07-10 18:10:17 -07:00
Jeff Schroeder
b339531ade Merge pull request #1604 from mrud/mru/improve_augeas 
Mru/improve augeas
 2012-07-10 08:20:58 -07:00
Thomas S Hatch
a100eb9406 Merge pull request #1603 from gcw/develop 
initial wempy template support (json and yaml); minimal testing
 2012-07-10 08:18:15 -07:00
Ulrich Dangel
ede5e4ba13 Add augeas module to documentation 2012-07-10 17:08:32 +02:00
Ulrich Dangel
d46f05bf0a Improve documentation for augeas.setvalue 2012-07-10 17:05:11 +02:00
Ulrich Dangel
a472c57325 Set lstrip_word to private 2012-07-10 17:05:11 +02:00
Jeff Schroeder
39efdf55e3 Merge pull request #1602 from mrud/mru/lsb 
Try to use lsb_release if module is available. Closes #1601
 2012-07-10 07:06:02 -07:00
Ulrich Dangel
3f8e44b41d Try to use lsb_release if module is available. Closes #1601 2012-07-10 15:53:40 +02:00
Jeff Schroeder
cba09f5141 Merge pull request #1600 from avimar/mysql-docs 
update help text for mysql.query
 2012-07-10 06:26:00 -07:00
Avi Marcus
452097112d Fix jinga typo 2012-07-10 16:23:55 +03:00
Avi Marcus
b86e2cbea1 fix help text: typo, capitalize key words and add jinja example for using results 2012-07-10 10:55:43 +03:00
G. Clifford Williams
08a16b356d initial wempy template support (json and yaml); minimal testing 2012-07-10 00:08:22 -05:00
Seth House
87c100075d Merge pull request #1599 from shouse-cars/revert-autosummary 
Revert autosummary experiment
 2012-07-09 16:18:39 -07:00
Seth House
36effed649 Revert "Merge branch 'doc-autosummary-headings' into develop" 
This reverts commit 7997ed4842, reversing
changes made to 83c901a174.
 2012-07-09 16:03:40 -07:00
Thomas S Hatch
2ea31be917 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-07-09 11:07:15 -06:00
Thomas S Hatch
c34b3e79f1 Init pillar in gem and virtualenv 2012-07-09 11:06:54 -06:00
Thomas S Hatch
df909be2b4 Add logging and checks to cmd_yaml pillar 2012-07-09 11:01:56 -06:00
Thomas S Hatch
080a02c738 Some fixes for better logging and safety 2012-07-09 10:52:44 -06:00
Jeff Schroeder
489f49579b Merge pull request #1598 from imankulov/ssh_bugfix 
Set up owner of ~/.ssh/known_hosts
 2012-07-09 09:02:05 -07:00
Roman Imankulov
8f2d83f382 Set up owner of ~/.ssh/known_hosts 
- Fixed behaviour, when if known_hosts is created by salt, then the
  owner of the file will be the salt process (usually, root)
- On the other hand, non-roots cannot set up ownership, and we skip
  this step for them (useful mostly in tests, though).
 2012-07-09 21:52:55 +06:00
Thomas S Hatch
2bff6cb455 Merge pull request #1595 from blast-hardcheese/develop 
Disabled initial socket bind check
 2012-07-09 08:10:58 -07:00
Jeff Schroeder
dc6c4c7eea Merge pull request #1596 from avimar/git-clone-empty-folder 
When GIT cloning to existing but empty folder, automatically delete it.
 2012-07-09 05:13:42 -07:00
Avi Marcus
0c5667c484 Rework error messages. When cloning to existing but folder, automatically delete it. 2012-07-09 12:13:37 +03:00
Devon Stewart
e8ec604c23 Fixing a typo 
Currently not an issue, since the value is never read, but this should
make it more obvious what to do to re-enable the check in the future.
 2012-07-09 01:56:04 -07:00
Devon Stewart
20cdbfbe55 Disabled socket bind check as per github issue #1594 2012-07-09 01:52:01 -07:00
Thomas S Hatch
b0dcb79486 Fix opts 2012-07-09 00:51:15 -06:00
Thomas S Hatch
89499be351 Configure virtualenv via pilar 2012-07-09 00:39:46 -06:00
Thomas S Hatch
f54b2df7e5 Allow postgress to be configured via pillar 2012-07-09 00:35:16 -06:00
Thomas S Hatch
c3409a699e Allow gen config from pillar 2012-07-09 00:29:17 -06:00
Thomas S Hatch
9f60f0b93f Fix gem module to use single quotes like the rest of Salt 2012-07-09 00:26:21 -06:00
Thomas S Hatch
172a0f1fd9 Allow aliases file to be defined in pillar 2012-07-09 00:18:02 -06:00
Thomas S Hatch
022c51c0bc Can now pass mysql options in pillar, Fix #1442 2012-07-09 00:13:40 -06:00
Thomas S Hatch
91a4c3fb9b Fix #1584 2012-07-08 23:24:17 -06:00
Thomas S Hatch
48b61db57e Merge pull request #1593 from intchanter/develop 
Develop
 2012-07-08 22:05:19 -07:00
Intchanter
f663dd2c46 Merge branch 'develop' of https://github.com/saltstack/salt into develop 
Conflicts:
	salt/states/network.py
	setup.py
	tests/integration/__init__.py
 2012-07-08 22:50:12 -06:00
Thomas S Hatch
fcf188eeaa Merge pull request #1592 from cluther/develop 
Support pkg module on Amazon Linux.
 2012-07-08 20:49:07 -07:00
Chet Luther
84ddc730b8 Support pkg module on Amazon Linux. 2012-07-09 03:43:42 +00:00
Thomas S Hatch
cf8de06b8b Merge pull request #1591 from avimar/1122 
add "reload" method for ubuntu's upstart
 2012-07-08 20:24:22 -07:00
Avi Marcus
1e7927cccb added function reload for ubuntu's upstart service manager 2012-07-08 22:05:22 +03:00
Avi Marcus
f3d4fbc993 Revert "added function reload for ubuntu's upstart service manager" 
This reverts commit 390fc64b4b.
 2012-07-08 22:04:21 +03:00
Avi Marcus
b5440b938a Merge branch 'develop' of https://github.com/saltstack/salt into 1122-ubuntu 2012-07-08 21:53:14 +03:00
Avi Marcus
390fc64b4b added function reload for ubuntu's upstart service manager 2012-07-08 21:53:00 +03:00
Thomas S Hatch
3787870a1f Remove deprecated hiera function 2012-07-08 00:56:30 -06:00
Thomas S Hatch
c388ff3f89 Add hiera ext_pillar 2012-07-08 00:55:39 -06:00