valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
56,713 Commits 24 Branches 182 Tags 341 MiB
342e0c0e10
Commit Graph

481 Commits

Author SHA1 Message Date
salt_build
6d99681b8d Moved file deletion to happen after user clicks install 2015-04-08 18:25:56 +00:00
Colton Myers
25f9b2d2d1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/cloud/action.rst
    doc/topics/cloud/function.rst
    doc/topics/reactor/index.rst
 2015-04-07 10:05:35 -06:00
Shane Lee
b71602a39c Update BuildSalt.bat 2015-04-06 17:52:58 -06:00
Shane Lee
4a3a8b4606 Update BuildSalt.bat 2015-04-06 17:52:38 -06:00
Shane Lee
ba1d3965d2 Update BuildSalt.bat 2015-04-06 17:51:49 -06:00
Shane Lee
8e8b4fb26f Update BuildSalt.bat 2015-04-06 17:50:49 -06:00
salt_build
c898b951bc Fixed problem with pip not working on portable install 2015-04-06 23:04:24 +00:00
Eric Cook
c3feffd229 allow caching minions, modules, or salt_dir individually. 2015-04-05 10:15:46 -04:00
Eric Cook
e384066899 skip completing minions when -N or --grain-regex is used. 2015-04-05 10:10:42 -04:00
Eric Cook
e419ce7dda fix --doc, --return and --out from 68552fd408 by delaying the expansion of salt_dir. 2015-04-05 10:07:54 -04:00
twangboy
51370ab2f9 Removed dialog box that was used for testing 2015-04-03 00:17:12 +00:00
twangboy
7377c503de Add switches for passing version to nsi script 2015-04-03 00:13:58 +00:00
jfindlay
4d0ea7a863 Merge pull request #22266 from twangboy/win_install_fix 
Win install fix
 2015-04-02 12:59:31 -06:00
Nahum Shalman
a51a90c128 SmartOS Esky: pkgsrc 2014Q4 Build Environment 
Need to clean up /var/db/pkgin
Need to install mysql-client explicitly
libzmq seems to link against libsodium... drag it along.
 2015-04-02 11:27:22 -04:00
twangboy
41a96d4daa Fixed hard coded version 2015-04-01 22:14:35 +00:00
twangboy
82b2f3e637 Removed message_box i left in for testing 
I'm an idiot
 2015-04-01 22:11:08 +00:00
Colton Myers
0b7ac988cc Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    .pylintrc
    salt/beacons/service.py
    salt/beacons/sh.py
    salt/modules/cassandra_cql.py
    salt/returners/cassandra_cql_return.py
 2015-04-01 14:22:33 -06:00
Colton Myers
1e3160f21c Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-04-01 14:17:35 -06:00
Shane Lee
9ab3d5e5b4 Merge pull request #22222 from twangboy/fix_installer 
Fixed problem with nested directories
 2015-04-01 08:08:05 -06:00
C. R. Oldham
bfeb08168e Merge remote-tracking branch 'upstream/2014.7' into 2015.2 2015-03-31 17:40:50 -06:00
twangboy
8615e8d403 Fixed problem with nested directories 2015-03-31 17:26:46 -06:00
twangboy
864438389d Removed _tkinter.lib 2015-03-31 11:53:17 -06:00
Thomas S Hatch
3530c783b1 Move zsh completion into a sane location 2015-03-30 16:27:05 -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
Stephen Spencer
307ded4e98 salt-api.service:LimitNOFILE=8192 
salt-master.service:LimitNOFILE=16384
salt-minion.service:LimitNOFILE=8192
salt-syndic.service:LimitNOFILE=8192
 2015-03-30 13:32:07 -05:00
Colton Myers
0269f3d544 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-03-30 09:30:58 -06:00
twangboy
110b0ef6f1 Remove .chm files from windows build 2015-03-30 14:26:30 +00:00
twangboy
de85a03add Pull minion config settings from minion conf 2015-03-28 00:14:01 +00:00
Stephen Spencer
9980a251e4 At the very least there should be a comment of some sort indicating what 
directive needs to be set.
 2015-03-27 15:50:43 -05:00
Stephen Spencer
8483fd37b7 Old crufty patches 2015-03-27 15:48:26 -05:00
Stephen Spencer
88be7b38d6 This is the (RPM) spec file used by Erik Johnson for building EPEL 
packages.

The only change:
avoid replacing the salt*.service files. Systemd ignores
/etc/security/limits*; it, instead, uses its own directives that are
required to exist in the service file itself.

See systemd.directives(7), systemd.exec(5), systemd-system.conf(5)
 2015-03-27 15:26:32 -05:00
Stephen Spencer
ab4bd93576 The spec file for salt-api is anachronistic at this point 2015-03-27 15:20:46 -05:00
Colton Myers
c924814e64 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-03-26 08:59:47 -06:00
Shane Lee
2605223e44 Update Salt-Minion-Setup.nsi 2015-03-26 07:03:51 -06:00
Shane Lee
9579bb2a8d Update Salt-Minion-Setup.nsi 2015-03-26 07:02:16 -06:00
twangboy
d3cb6ddcd5 Accounted for silent install 2015-03-25 16:27:41 -06:00
twangboy
6bfe6fd4f6 Checks for existing installation and prompts to remove 2015-03-25 16:27:41 -06:00
Colton Myers
70406867a4 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    salt/client/__init__.py
    salt/modules/file.py
    salt/modules/yumpkg.py
    salt/modules/zypper.py
    tests/integration/shell/auth.py
    tests/unit/states/archive_test.py
    tests/unit/states/module_test.py
 2015-03-20 20:09:19 -06:00
Colton Myers
9b8f6085d2 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    pkg/windows/BuildSalt.bat
    pkg/windows/installer/Salt-Minion-Setup.nsi
 2015-03-20 14:39:22 -06:00
Shane Lee
febef7eb78 Update salt-cp.bat 2015-03-20 14:18:57 -06:00
twangboy
d5da92e58c Added batchfiles to mimick the behavior of the exe's 2015-03-20 14:12:48 -06:00
twangboy
81025d8388 Fixed version parameter 2015-03-20 13:50:56 -06:00
twangboy
db64bef89c Updated BuildSalt and Salt-Minion-Setup.nsi 
- Fixed problem with missing folders and files
- Fixed problem with detecting cpu architecture
 2015-03-20 13:48:08 -06:00
Colton Myers
270027ff8d Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    pkg/windows/installer/Salt-Minion-Setup.nsi
    salt/modules/mine.py
 2015-03-20 13:34:30 -06:00
twangboy
fbec10071a Edited Salt-Minion-Setup.nsi, Added BuildSalt.bat 2015-03-20 13:19:44 -06:00
twangboy
98944e9842 Added file to slim the windows install 2015-03-20 13:18:37 -06:00
twangboy
ced2e57165 Added files for the New Portable Salt Installer 2015-03-20 11:25:13 -06:00
Colton Myers
d82d7645c9 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    salt/modules/cmdmod.py
    salt/modules/debian_ip.py
    salt/modules/drac.py
    salt/modules/rpm.py
    salt/returners/postgres_local_cache.py
 2015-03-19 16:13:16 -06:00
twangboy
3af33668c9 Edited Salt-Minion-Setup.nsi, Added BuildSalt.bat 2015-03-18 19:19:16 -06:00
twangboy
cccb24da92 Added file to slim the windows install 2015-03-18 17:52:27 -06:00
twangboy
43b560e2ee Added files for the New Portable Salt Installer 2015-03-18 17:35:09 -06:00
Eric Cook
68552fd408 silent errors from salt-key, cache salt_dir and skip completing minions when -G or --grain is used. 2015-03-10 18:01:38 -04:00
Eric Cook
3a453155eb shell completion: test the correct cache for minions 2015-02-27 18:31:58 -05:00
Eric Cook
4b9868b101 shell completion: allow caching of modules and minions 2015-02-27 09:41:00 -05:00
Niels Abspoel
7b6a222b8c Updated salt spec file for 2014.7.2 2015-02-26 22:26:21 +01:00
Joseph Hall
c4cec24646 Merge pull request #20395 from jfindlay/mv_zsh_cmp 
mv zsh completion to pkg/
 2015-02-05 12:20:04 -07:00
Sebastian Hahn
122e253960 Update Macports Portfile 
This update came out of a discussion on the macports bug available at
https://trac.macports.org/ticket/46107.
 2015-02-05 07:22:54 +01:00
Justin Findlay
8605281629 mv zsh completion to pkg/ 
fix #19892
 2015-02-04 13:50:35 -07:00
Colton Myers
8bba4bbec4 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	salt/cloud/clouds/msazure.py
	salt/modules/boto_sns.py
	salt/states/boto_sns.py
	tests/integration/modules/boto_sns.py
	tests/integration/states/boto_sns.py
 2015-01-23 14:20:34 -07:00
Colton Myers
c1e630340e Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/fileserver/gitfs.py
	salt/grains/core.py
 2015-01-22 16:46:32 -07:00
Nahum Shalman
32c222f8f2 SmartOS Esky: fix build version identification 
"bdist" doesn't do the right thing in the absence of
version files produced by "sdist".
Run "sdist" then extract out the contents of the tarball
into place
 2015-01-21 20:06:48 -05:00
Roman Inflianskas
0b4f05236b [fish shell completion] updated comments 2015-01-08 15:30:29 +03:00
Colton Myers
f6eae029f0 Merge branch '2014.7' into merge-forward-2015.2 
Conflicts:
	pkg/windows/installer/Salt-Minion-Setup.nsi
	salt/grains/core.py
	salt/minion.py
	salt/modules/mongodb.py
	salt/states/archive.py
	salt/states/mount.py
	salt/utils/master.py
	salt/utils/schedule.py
	salt/utils/thin.py
	tests/jenkins-ng.py
 2015-01-06 13:14:27 -07:00
Roman Inflianskas
2d7e1d4809 [fish shell completion] adopt for non-interactive usage (e.g. from scripts) 2015-01-06 21:31:19 +03:00
Loren Gordon
7f7c7bd337 Update vcredist version, fixes saltstack/salt#19387 
Install the most current version of vcredist, Microsoft Visual C++ 2008
Service Pack 1 Redistributable Package MFC Security Update.
 2015-01-06 12:18:13 -05:00
Loren Gordon
a1d7868d64 Update vcredist version, fixes saltstack/salt#19387 
Install the most current version of vcredist, Microsoft Visual C++ 2008
Service Pack 1 Redistributable Package MFC Security Update.
 2015-01-06 12:02:36 -05:00
Justin Findlay
ad33589fac move requirements files into requirements dir 2014-12-27 17:29:03 -07:00
Tiru Srikantha
d1192819c5 Change URL for vcredist_x64 to SP1 DL URL 
Fixes saltstack/salt#18935
 2014-12-11 14:27:32 -08:00
Pedro Algarvio
733b31da23 Merge branch '2014.7' into develop 
Conflicts:
	tests/unit/modules/hashutil_test.py
	tests/unit/templates/jinja_test.py
 2014-11-27 03:59:40 +00:00
C. R. Oldham
f41cc45a8f Switch nssm back to 32-bit 2014-11-26 13:35:53 -07:00
Niels Abspoel
3d9fa5ce1c Updated suse spec file to salt 2014.7 2014-11-19 22:48:12 +01:00
Thomas S Hatch
2be11167d6 Merge pull request #18140 from rominf/fish-completion 
fish shell completion: fix broken arguments completion
 2014-11-17 17:14:28 -07:00
Arjan de Vries
e01c27d225 Fix Silent install added option /SD to messagebox 2014-11-10 15:58:53 +01:00
Colton Myers
0cc0d64136 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/hg.py
 2014-10-31 16:14:34 -06:00
C. R. Oldham
6c9be002c5 Update nssm to 2.24 2014-10-30 22:15:26 -04:00
Niels Abspoel
faaeb57759 Updated spec file to 2014.1.13 2014-10-27 22:47:30 +01:00
Erik Johnson
33a74e422e Update Fedora/RHEL spec for 2014.1.13 2014-10-17 10:46:14 -05:00
Roman Inflianskas
49fca16fb4 fish shell completion: fix broken arguments completion 2014-10-12 13:51:47 +04:00
Erik Johnson
713f3ecc73 Spelling fixes 2014-10-11 20:13:45 -05:00
Niels Abspoel
5fd3ef480f updated salt.spec file for suse: 
this fixes #16560
 2014-10-11 20:29:52 +02:00
Erik Johnson
b18ae95f84 Update RPM spec for 2014.1.11 2014-10-01 18:35:23 -05: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
David Boucha
25303c586f remove problematic expect fork 2014-09-18 10:40:05 -06:00
Roman Inflianskas
ef2b3d81b9 fish shell completion: merge 2014-09-13 14:45:20 +04:00
Roman Inflianskas
f986dee05a fish shell completion: fix remote cmd completion for cmd.run and similar 2014-09-13 14:33:53 +04:00
Pedro Algarvio
781092daaa Merge branch '2014.7' into develop 2014-09-11 22:42:04 +01:00
Jille Timmermans
a8e3586aa1 Some textual fixes 2014-09-11 14:45:44 +02:00
Roman Inflianskas
7b5b3f2c11 fish shell completion: add help for arguments 2014-09-11 13:10:06 +04:00
Roman Inflianskas
ecf7ddacf6 fish shell completion: move salt options to salt file 2014-09-11 13:10:06 +04:00
Nahum Shalman
adc71a4de9 SmartOS esky: build needs to invoke sdist 
per saltstack/salt#15405
 2014-09-10 16:29:13 -04:00
C. R. Oldham
06fac568bd Merge pull request #15665 from rominf/fish-completion 
fish shell completion: add remote cmd complition for cmd.run and similar
 2014-09-10 14:01:33 -06:00
Roman Inflianskas
8e19313fa9 fish shell completion: add remote cmd complition for cmd.run and similar 2014-09-10 23:56:44 +04:00
David Boucha
810d2a6d9a Merge pull request #15664 from UtahDave/2014.7fixreg 
replace version with a jinja variable
 2014-09-10 13:55:23 -06:00
David Boucha
df91a0929a replace version with a jinja variable 2014-09-10 13:52:13 -06:00
Thomas S Hatch
0004ff8898 Merge branch '2014.7' into develop 2014-09-09 11:20:29 -06:00
Nahum Shalman
aa0e7209c5 SmartOS Esky: Fix minion SMF manifest 
Some users reported an errror that SMF couldn't find auditconfig despite
the fact that the PATH is set correctly. Invoking with the full path
seems to fix the issue.
 2014-09-08 16:07:48 -04:00
Thomas S Hatch
647490b677 Merge pull request #15567 from rominf/fish-completion 
Fish completion improvements
 2014-09-06 16:33:34 -06:00
Roman Inflianskas
6b244f8326 fish shell completion: add syndic completion 2014-09-06 14:09:45 +04:00
Roman Inflianskas
83fc5374bc fish shell completion: make it possible use completions without salt-master installed 2014-09-06 14:09:20 +04:00
Thomas S Hatch
2f6ae96f37 Merge branch '2014.7' into develop 
Conflicts:
	salt/client/ssh/__init__.py
 2014-09-03 14:43:07 -06:00