valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
33,806 Commits 24 Branches 182 Tags 341 MiB
b5172ed0ac
Commit Graph

33806 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vs
e1c8aa0458 Add optional signing of the master pubkey if enabled in config. 
Uses salt.crypt.sign_message() to create a signature of the pubkey
and adds that signature to the payload send to authenticated minions.
 2014-07-03 10:31:35 -07:00
vs
7b7045d10b add settings for master and minion to sign the public / verify pubkey signature 
Add a setting for the master to generate a new signing key-pair for signing purposes
and use the key-pair to sign the masters public key that is send to authenticated
minions.

Add a setting for the minion to verify the signature of a public key received from
the master. Requires to have the signing key-pair from the master on the minion.
 2014-07-03 10:29:02 -07:00
vs
1efd8a6025 add key name to logging output 2014-07-03 10:28:47 -07:00
vs
2d590aa4b7 fix join()'s to form the correct file names 2014-07-03 10:28:33 -07:00
Joseph Hall
2e090cfb18 File extension should be .p, not .pp 2014-07-03 11:28:29 -06:00
vs
4850de0f1f make MasterKeys() more flexible by allowing different key-names. 
MasterKeys() should be able to handle more than one hardcoded key.
The default is still to just handle master.* files but can also generate
new key-pairs with different names and return the pub-key.
 2014-07-03 10:28:23 -07:00
vs
0226b988f3 add master_sign_key_name and generation of the actual sign-key-files if activated 2014-07-03 10:27:29 -07:00
Mathieu Le Marec - Pasquet
15c6aa829c tls additions: 
- cacert_path can be customized more easily
    - add a new get_ca function to get the cacert path or content
 2014-07-03 19:24:21 +02:00
Samuel Smith
b139f9a160 Merge pull request #13967 from SmithSamuelM/sam_raet_50 
Now using new raet.nacling.uuid function to generate the yard names this...
 2014-07-03 10:47:53 -06:00
Samuel M Smith
c6e3775e1a Now using new raet.nacling.uuid function to generate the yard names this should prevent 
any race conditions in yard names that were occuring with the old way of using gen_jid which was only microsecond rsolution
and therefore might generate two yards with the same name.

Needs RAET v 0.1.01
 2014-07-03 10:39:55 -06:00
Nitin Madhok
36f164db21 Adding test ability in pull, push and built state functions 2014-07-03 11:55:25 -04:00
Joseph Hall
afba55e3b4 Merge pull request #13955 from terminalmage/docs 
Add reactor example for updating fileserver on git push
 2014-07-02 20:12:56 -06:00
Erik Johnson
1b1eb26587 Add reactor example for updating fileserver on git push 2014-07-02 21:03:09 -05:00
Thomas S Hatch
07f55489b8 Merge pull request #13942 from cachedout/call_test_fix 
Fix broken test.
 2014-07-02 17:10:16 -06:00
Thomas S Hatch
e1ed7a0eee Merge pull request #13939 from nmadhok/fix-pylint 
Fixing lint
 2014-07-02 17:09:24 -06:00
Thomas S Hatch
f9dc61b8be Merge pull request #13936 from cachedout/mine_raet 
Mine over raet
 2014-07-02 17:08:15 -06:00
Colton Myers
b3331dfa91 Merge pull request #13950 from basepi/2014.1.6release 
Add newest cherry-pick to 2014.1.6 release notes
 2014-07-02 16:39:09 -06:00
Colton Myers
9537ada5d2 Add newest cherry-pick to 2014.1.6 release notes 2014-07-02 16:38:40 -06:00
Colton Myers
2d32d54407 Merge pull request #13948 from basepi/filedirctorydoc13866 
Improve file.directory documentation around `recurse`
 2014-07-02 16:06:03 -06:00
Colton Myers
400a8ab351 Improve file.directory documentation around `recurse 2014-07-02 16:05:18 -06:00
Samuel Smith
f316c64d08 Merge pull request #13947 from SmithSamuelM/sam_raet_49 
Used get. for some reason opts['id'] not always available
 2014-07-02 16:02:00 -06:00
Samuel M Smith
b2526492fd Merge remote-tracking branch 'upstream/develop' into sam_raet_49 2014-07-02 15:59:44 -06:00
Samuel M Smith
d556ba8ee7 use get incase id not in opts 2014-07-02 15:59:09 -06:00
Mike Place
51e3089a7c Fix broken test. 2014-07-02 14:40:08 -06:00
Nitin Madhok
bd51c3305f Fixing lint in salt/modules/tls.py 2014-07-02 16:12:51 -04:00
Nitin Madhok
900021a820 Fixing lint in tests/integration/shell/auth.py 2014-07-02 16:11:49 -04:00
Nitin Madhok
a5fb5ad44f Fixing lint in salt/daemons/flo/core.py 2014-07-02 16:09:50 -04:00
Samuel Smith
df2ab0837e Merge pull request #13938 from SmithSamuelM/sam_raet_49 
Added stale yard keep directory cleanup behavior to master and minion
 2014-07-02 13:51:49 -06:00
Samuel M Smith
98ebad06c5 Merge remote-tracking branch 'upstream/develop' into sam_raet_49 2014-07-02 13:47:55 -06:00
Samuel M Smith
22ca5b0b51 Added behavior to master and minion to clean up stale yard keep directories on startup 
Refactored flo scripts to ensure cleanup runs first
Refactored road and lane setup behaviors so the stack creation happens in action not postinitio so that
stacks do not start until after cleanup
 2014-07-02 13:45:20 -06:00
Mike Place
f5b544c7c6 Mine over raet 2014-07-02 12:01:30 -06:00
Thomas S Hatch
a351337784 Merge pull request #13914 from garethgreenaway/13910_recurse_symlink 
Fix to file.check_perms related to symlinks and chmod
 2014-07-02 11:18:10 -06:00
Thomas S Hatch
dff407690d Merge pull request #13909 from garethgreenaway/13758 
Ability to specify multiple sources for file.recurse, picking the first one that exists.
 2014-07-02 10:21:48 -06:00
Thomas S Hatch
c7c5ab90c1 Merge pull request #13908 from lyft/boto-elb-activate-deactivate 
Add support for registering and deregistering ELB members in boto_elb mo...
 2014-07-02 10:19:35 -06:00
Thomas S Hatch
337c065e9d Merge pull request #13906 from s0undt3ch/hotfix/lint 
Lint fixes
 2014-07-02 10:18:18 -06:00
Thomas S Hatch
4eccf705cb Merge pull request #13905 from s0undt3ch/hotfix/transifex-updates 
Update 'doc/.tx/config' - Build #99
 2014-07-02 10:17:51 -06:00
Thomas S Hatch
a985508513 Merge pull request #13902 from cachedout/auth_test_fixing 
Fix failing auth test
 2014-07-02 10:17:16 -06:00
Thomas S Hatch
199b2bc2a9 Merge pull request #13895 from jeteokeeffe/patch-2 
Adding logrotate script for salt in rpm
 2014-07-02 10:16:47 -06:00
Thomas S Hatch
593aceb225 Merge pull request #13893 from jeteokeeffe/patch-1 
Adding logrotate file
 2014-07-02 10:16:06 -06:00
Thomas S Hatch
861ab75ebc Merge pull request #13882 from techhat/sqlitequeue 
Fix the option for sqlite_queue_dir
 2014-07-02 10:14:14 -06:00
Thomas S Hatch
cf527511e5 Merge pull request #13881 from garethgreenaway/salt_schedule_like_cron 
Adding the ability to schedule Salt jobs using cron like syntax
 2014-07-02 10:08:28 -06:00
Thomas S Hatch
92b354d11d Merge pull request #13880 from craig5/develop 
add finger_master to key module
 2014-07-02 10:07:00 -06:00
Thomas S Hatch
1c46fa0383 Merge pull request #13877 from spsoit/mod_random_uses_pycrypto 
mod_random to use pycrypto backend
 2014-07-02 10:04:09 -06:00
Thomas S Hatch
489729e3ef Merge pull request #13874 from makinacorpus/ssl 
Check and fix wrong x509 version field.
 2014-07-02 10:03:00 -06:00
Volker Schwicking
4c2949a267 formatting improvements, little text rework 2014-07-02 14:32:19 +02:00
Volker Schwicking
4099a9d5fc formatting improvements, little text rework 2014-07-02 14:31:49 +02:00
Volker Schwicking
14a0441dec formatting improvements, little text rework 2014-07-02 14:29:35 +02:00
Volker Schwicking
06baca4cf5 formatting codeblocks etc. 2014-07-02 13:51:47 +02:00
Volker Schwicking
e7838c3641 formatting and text reworks 2014-07-02 13:44:50 +02:00
Volker Schwicking
2e8e00f879 fix note to display as note 2014-07-02 12:44:52 +02:00