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
71,674 Commits 24 Branches 182 Tags 341 MiB
ca61237de7
Commit Graph

658 Commits

Author SHA1 Message Date
Niels Abspoel
15139c3e1a updated suse spec file to version 2015.5.0 2015-05-15 22:51:28 +02:00
Colton Myers
7d8038f134 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    debian/changelog
    salt/modules/win_pkg.py
    salt/pillar/__init__.py
    salt/states/file.py
 2015-05-14 10:27:00 -06:00
Colton Myers
bd635488ef Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-05-13 11:49:55 -06:00
twangboy
038331edab Fixed checkbox for starting service and actually starting it 2015-05-12 18:04:42 +00:00
Eric Cook
7b396785e4 mutually exclusive completion for the target options 2015-05-05 17:06:07 -04:00
Colton Myers
befb666623 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    salt/modules/mongodb.py
    salt/utils/http.py
    salt/utils/process.py
    tests/integration/__init__.py
 2015-04-27 10:28:53 -06:00
Colton Myers
a18e017619 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/man/salt.1
    doc/ref/cli/salt.rst
 2015-04-24 10:07:48 -06:00
Justin Findlay
3d575e29c4 set systemd service killMode to process for minion 
Fixes #22993.

The change is only made for the minion process because, theoretically,
only the minion could create the problem described.  salt-master and
salt-syndic do not theoretically spawn non-salt processes during the
lifetime of their processes, whereas salt-minion does this by design.

The default behavior for systemd killMode seems to be control-group,
which means all processes that share the same control group as the
minion process will also be killed by systemd when the minion service is
stopped (killed).

It is reasonable to expect that activity done on a system by a salt
minion should persist beyond the lifetime of the minion process, so
let's not kill procs that the minion starts even when the minion exits.
 2015-04-23 16:18:19 -06:00
Colton Myers
1a38b4b834 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    salt/cli/salt.py
    salt/client/mixins.py
    salt/renderers/pyobjects.py
 2015-04-22 11:07:01 -06:00
salt_build
7cbabd0cf9 Updated icon file for windows 2015-04-21 22:33:59 +00:00
Colton Myers
bd6ecdfd43 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    doc/topics/installation/windows.rst
    doc/topics/tutorials/gitfs.rst
    salt/pillar/pepa.py
    salt/states/artifactory.py
    salt/states/pip_state.py
    salt/transport/__init__.py
 2015-04-21 10:42:22 -06:00
Colton Myers
92c51affc5 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-04-21 10:33:39 -06:00
salt_build
7235bb0b68 Removed some parenthesis 2015-04-20 23:59:33 +00:00
salt_build
a4e24f5c6a Added new panel graphic to installer 2015-04-20 23:56:11 +00:00
salt_build
3f180cfaae Added ability to send a version with a space in it 2015-04-20 21:55:57 +00:00
Colton Myers
ef583295d5 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    salt/beacons/service.py
 2015-04-20 11:41:25 -06:00
Colton Myers
929b7baaf3 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-04-17 11:38:54 -06:00
Justin Findlay
3c91459de2 Merge pull request #22759 from twangboy/fix_bat_one_last_time 
Final edits to the batch files for running salt
 2015-04-16 22:31:15 -06:00
salt_build
4d25af8acf Fixed version not showing in Add/Remove Programs 2015-04-16 22:43:51 +00:00
salt_build
075f82e046 Final edits to the batch files for running salt 2015-04-16 22:08:27 +00:00
twangboy
223c46a38e Removed redundent \ and " 2015-04-16 18:40:23 +00:00
Colton Myers
66378be75e Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    doc/ref/states/requisites.rst
    salt/master.py
    salt/modules/win_pkg.py
 2015-04-16 12:27:53 -06:00
Colton Myers
000de95974 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    .pylintrc
    doc/ref/runners/all/salt.runners.nacl.rst
    doc/topics/cloud/config.rst
    salt/cli/salt.py
    salt/client/mixins.py
    salt/client/ssh/__init__.py
    salt/loader.py
    salt/minion.py
    salt/modules/cassandra_cql.py
    salt/modules/gpg.py
    salt/modules/grains.py
    salt/modules/iptables.py
    salt/modules/yumpkg.py
    salt/netapi/rest_cherrypy/app.py
    salt/renderers/pyobjects.py
    salt/returners/mysql.py
    salt/runners/jobs.py
    salt/state.py
    salt/states/file.py
    salt/states/service.py
    salt/utils/minions.py
    tests/integration/__init__.py
    tests/integration/netapi/rest_tornado/test_app.py
    tests/integration/states/cmd.py
 2015-04-16 12:15:44 -06:00
Colton Myers
8d9874a78a Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-04-16 10:37:38 -06:00
salt_build
2d3d0b1c15 Changed %cd% to %~dp0 2015-04-16 15:07:28 +00:00
Colton Myers
9099884809 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/cloud/config.rst
    salt/modules/win_disk.py
    salt/modules/yumpkg.py
    salt/pillar/s3.py
    salt/states/service.py
    salt/utils/event.py
    tests/integration/netapi/rest_tornado/test_app.py
    tests/integration/netapi/test_client.py
    tests/unit/states/archive_test.py
 2015-04-14 11:03:03 -06:00
Thomas S Hatch
2364dfd0f1 Merge pull request #22094 from gladiatr72/RPM_systemd_NOFILE 
fine tuning systemd support (or, how not to destroy open-file limits when upgrading your salt-master)
 2015-04-13 15:47:34 -06:00
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
Erik Johnson
cbdee403bd Add salt-api unit file symlink 2014-09-03 13:42:21 -05:00
Mike Place
be60e25574 Merge branch '2014.7' into develop 2014-09-02 13:56:54 -06:00
Nahum Shalman
df7736b530 SmartOS esky: fix odd problem with zeromq linking 2014-09-01 12:50:07 -04:00
Roman Inflianskas
4fc7b4b1e4 add fish shell completions for salt programs 2014-08-27 18:59:15 +04:00
Colton Myers
ad89a752f8 Merge branch '2014.7' into develop 
Conflicts:
	salt/cloud/__init__.py
	salt/utils/cloud.py
 2014-08-25 13:29:29 -06:00
Chris Rebert
fcc41721fd sodium_grabber_installer: fix kwarg spacing 
************* Module sodium_grabber_installer
pkg/smartos/esky/sodium_grabber_installer.py:16: [C0326(bad-whitespace), ] No space allowed around keyword argument assignment
    sources = [path.join(HERE, 'sodium_grabber.c')],
            ^
pkg/smartos/esky/sodium_grabber_installer.py:17: [C0326(bad-whitespace), ] No space allowed around keyword argument assignment
    libraries = ['sodium'],
              ^
 2014-08-22 12:04:34 -07:00
Thomas S Hatch
f0009be6c2 Merge branch '2014.7' into develop 2014-08-21 17:20:26 -06:00
Nahum Shalman
d0dac42958 SmartOS esky build environment instructions cleanup 2014-08-21 17:37:55 -04:00
Nahum Shalman
cdae8948a1 SmartOS esky packaging of 2014.7 
Resulting builds can be used either with zeromq or with raet
 2014-08-21 16:01:46 -04:00
Chris Rebert
baa4f852df fix typo: Feauture => Feature 2014-08-11 11:00:23 -07:00
Erik Johnson
17049624ea Fix incorrect conditional in spec 2014-08-10 12:20:30 -05:00
Thomas S Hatch
e311dae191 Merge pull request #14761 from terminalmage/update-spec 
Update RPM spec for 2014.1.10
 2014-08-08 15:57:43 -06:00
Thomas S Hatch
616e61f663 Merge pull request #14742 from steverweber/fix_stuff 
catch exceptions and fix some vars
 2014-08-06 11:58:00 -06:00
Erik Johnson
5f9931636a Deploy /var/cache/salt with common RPM 
Also changed the deprecated $RPM_BUILD_ROOT to %{buildroot}.
 2014-08-05 22:15:34 -05:00
steve
bc3ade860c catch exceptions and fix some vars 2014-08-05 22:39:57 -04:00
Erik Johnson
670e315c19 Update RPM spec for 2014.1.10 2014-08-05 17:02:35 -05:00
Colton Myers
13995afba0 Merge branch '2014.7' into develop 
Conflicts:
	doc/topics/releases/2014.7.0.rst
 2014-08-05 15:32:04 -06:00
Nahum Shalman
7a0044a8f5 SmartOS Esky: py27-mysqldb in build environment 
Requested by @johngrasty
 2014-08-04 16:15:17 -04:00
Niels Abspoel
d9bfda2dcd This fixes two issues #14337 and #13788 
use-forking-daemon.patch -> #14337
the other patchesr are for #13788

With thanks to Tim Serong who created the patches.
 2014-07-29 20:34:12 +02:00
Elias Probst
43589f380d Drop outdated ebuilds. Maintained now by Gentoo in app-admin/salt 2014-07-23 10:52:11 +02:00
Seth House
95f31c591d Fix 'stop' for RedHat salt-api init script 2014-07-21 20:46:26 -06:00
Thomas S Hatch
63ea2267cd Merge pull request #14216 from cro/portfile 
Update MacPorts Portfile
 2014-07-14 17:14:37 -06:00
C. R. Oldham
3f0b561cb4 Next iteration of the Portfile 2014-07-14 15:36:11 -06:00
C. R. Oldham
a1d7e44d84 Use plists in "pkg/darwin" instead 2014-07-14 12:26:38 -06:00
Khris Richardson
1acd82f3f1 add sphinx spelling extension. enforce en_us 2014-07-13 13:43:33 -05:00
David Boucha
ea12719881 bump windows installer version 2014-07-12 23:18:58 -06:00
Niels Abspoel
5b451d7e2d updated suse spec file for 2014.1.7 2014-07-11 19:50:06 +02:00
Erik Johnson
1197a06716 Update spec for 2014.1.7 2014-07-10 20:52:00 -06:00
C. R. Oldham
88c2fd3872 Portfile and .plist files for MacPorts 2014-07-10 11:20:26 -06:00
Thomas S Hatch
779aa72367 Merge pull request #14070 from nshalman/requirements 
SmartOS esky build: requirements files
 2014-07-09 21:23:23 -06:00
C. R. Oldham
46fdc9b5dd Portfile and .plist files for MacPorts 2014-07-09 16:46:02 -06:00
Nahum Shalman
7fbe259eea SmartOS esky build: requirements files 
Mimicking the breakout of requirements files in the main project,
this allows me to keep a file of extra requirements that get put in the
esky (e.g. halite) while only needing to point the build process at
either the zeromq or raet requirements file.
 2014-07-09 17:49:46 -04: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
Jete
31c3267e59 Adding logrotate script for salt in rpm 2014-07-01 17:05:27 -04:00
Jete
323de1e833 Adding logrotate file 
Adding logrotate file for salt logs
 2014-07-01 17:02:20 -04:00
Jesse Collier
e04043aabd Adding expect fork to upstart script 2014-06-25 13:33:56 -07:00
bhepple
ed3166990c Update salt-minion 
On our RHEL5 systems we're getting 2 and sometimes 3 or more salt-minions started. Somehow the check on /var/run/salt-minion.pid doesn't prevent this.

This patch stops the registered process and kills any further salt-minion processes, first trying -TERM and then -KILL signals.

It may be that other distros would like to use this same logic to tidy up, in which case the new code can be moved into place as appropriate.
 2014-06-25 14:58:02 +10:00
Erik Johnson
aa9ae49129 Add additional information to the comments for the shar script 2014-06-23 16:00:19 -05:00
Matthieu Guegan
49419f94c3 Add a method context environment PATH 
Some modules are referring to PATH env variable which do not contains /opt/local/.. paths by default. This fix provides correct PATH handling
 2014-06-22 11:38:35 +02:00
Thomas S Hatch
a65bdce734 Merge pull request #13573 from nshalman/smartos-audit-context 
SmartOS: run salt minion in an audit context
 2014-06-19 14:48:38 -06:00
Nahum Shalman
3e5742bb73 SmartOS: run salt minion in an audit context 
This fixes an issue @njones11 was having with
multiple cron.present states.

"crontab -l <username>" would fail, so the temp file
would be empty, a given cronjob would go in
and then the "su - <username> crontab <temp file>" would
succeed.

This evaded debugging attempts because if you invoked the salt
minion manually from a login shell, an audit context would
already exist and the "crontab -l <username>" would succeed.

The hint was a message in the debug log of:
[ERROR   ] Command 'crontab -l legion' failed with return code: 1
[ERROR   ] stderr: crontab: The audit context for your shell has not
been set.

We explicitly set up an audit context when launching the salt minion
which allows "crontab -l <username>" to succeed.

This may fix other issues and something similar
should perhaps be applied to pkg/smartos/salt-minion.xml

"5417" was chosen arbitrarily
 2014-06-19 16:11:49 -04:00
Erik Johnson
54e47ca522 Use bash for build_shar.sh 
Bourne shell doesn't support arrays
 2014-06-19 15:04:10 -05:00
Seth House
53bab586f4 Merged salt-api into Salt 
Woot!

The conflicts below are intentional because they contained salt-api-isms
that needed to be included into the corresponding Salt files.

Conflicts:
	debian/changelog
	debian/control
	doc/conf.py
	doc/index.rst
	opt_requirements.txt
	salt/config.py
	salt/loader.py
 2014-06-18 22:13:56 -06:00
Seth House
057a3ca723 Renamed PKGBUILD files to not conflict with Salt-core PKGBUILDs 2014-06-18 19:28:03 -06:00
Seth House
210ecf4a50 Moved salt-api.spec file to corresponding Salt-core directory 2014-06-18 19:25:56 -06:00
Niels Abspoel
c950a14e64 updated suse spec file for 2014.1.5 2014-06-13 21:18:36 +02:00
Pedro Algarvio
7bd8b1360f Remove remaining exsel code 2014-05-29 01:32:54 +01:00
David Boucha
679b178111 bump windows installer version number 2014-05-19 17:57:50 -06:00
Erik Johnson
82960a7480 Update RPM spec for 2014.1.4 2014-05-10 00:06:33 -05:00
Erik Johnson
a9a951df26 Dispose of temp virtualenv before installing deps 2014-05-09 00:05:40 -05:00
Erik Johnson
0bd6ec2282 Update build_shar.sh 
Added the following arguments

* -p - specify prefix
* -d - specify directory containing pre-downloaded dependency tarballs

Additional tweaks:

* Switched to using virtualenv to ensure that a new enough version of
  pip is available. Older pip seems to have issues with downloading the
  dependencies, silently failing to download certain tarballs. This
  removes the hard dep on python-pip, and adds python-virtualenv as a
  hard dep.

* Detect bundled zeromq in pyzmq tarball, and use it instead of trying
  to fetch it. This, coupled with the new -d option, allows for the
  entire stack of deps to be frozen for consistency in packaging.
 2014-05-08 22:03:16 -05:00
Nahum Shalman
6af019d7cf smartos esky: improve "installer" 
detect if this is a global or non-global zone
global zones are always minions

if the user passes in the name/address of the master
we configure a minimal minion file and launch the minion
 2014-05-08 12:04:22 -04:00
Erik Johnson
9b38263b4f Add /opt/share/man to MANPATH 2014-05-06 22:51:00 -05:00
Erik Johnson
c3e89eeceb Compress man pages 2014-05-06 22:50:39 -05:00
Pedro Algarvio
31033aac6b Merge pull request #12545 from aboe76/suse_spec_update 
updated suse spec file for 2014.1.4
 2014-05-06 06:02:19 +01:00
Erik Johnson
e11f1e4564 remove errexit 2014-05-05 13:40:19 -05:00
Niels Abspoel
98d32aa37e updated suse spec file for 2014.1.4 2014-05-05 20:39:19 +02:00
Ryan Davis
8fdced7877 windows: update to nssm 2.21.1 
new 32-bit binary for nssm.exe, upgrading from the previous 2.16.

Has some bug fixes, see http://nssm.cc/changelog.

Driving impetus to upgrade was "Silently ignore INTERROGATE control.",
on win2012 nssm spews ~30 event log messages per minute.

Tested by stopping windows minion, replacing nssm.exe, and restarting.
 2014-05-02 09:13:00 -04:00
Dennis Herbrich
f1a8a538fc Fix typo in Type declaration of systemd unit 
The systemd service type must be declared in lower case, otherwise systemd generated a warning and ignores the declaration.
 2014-04-23 15:11:00 +02:00
Erik Johnson
4e3430d751 Fix comments in shar build script 2014-04-21 16:38:34 -05:00
Erik Johnson
5ed7be5b2e Update spec file for 2014.1.3 2014-04-18 18:19:14 -05:00
Niels Abspoel
5cd37adb7d updated suse spec file to 2014.1.3 2014-04-18 20:35:33 +02:00
David Boucha
9c5880c188 bump windows installer version 2014-03-31 13:33:39 -06:00
Thomas S Hatch
28dd3e17e5 Merge pull request #11523 from dlanderson/no_su_upstart 
Remove "su -c" from upstart scripts
 2014-03-26 12:14:48 -06:00
David Anderson
31d7d327be Remove "su -c" from upstart scripts 2014-03-25 16:10:08 -06:00
Niels Abspoel
2a39b57155 updated suse release to 2014.1.1 2014-03-25 21:08:36 +01:00
Thomas S Hatch
3cbf31bd80 Merge pull request #11440 from pzbitskiy/nsis-vc-redist 
Check for VC 2008 redist package in Windows installer
 2014-03-24 15:39:30 -06:00
Pedro Algarvio
9ec00d2834 Fix wrong permissions 2014-03-23 18:22:35 +00:00
pzbitskiy
b25d21f666 Check for VC 2008 redist package in Windows installer 
* Download and install vcredist_x86 / vcredist_x64 if needed
* Fix for #10716
 2014-03-22 17:31:05 +04:00
Daniel Wallace
198e3eee8a Yay systemd.daemon.notify 
requires the python2 systemd bindings
 2014-03-14 08:19:52 -05:00
Erik Johnson
381d6ac305 Add shar pkg build script 2014-02-28 21:48:15 -06:00
Thomas S Hatch
6085b921bf Merge pull request #10785 from terminalmage/rhel6-upstart 
Add RHEL6-specific upstart config files
 2014-02-26 12:54:11 -07:00
Erik Johnson
08d90a7beb Add RHEL6-specific upstart config files 
RHEL6 doesn't use the net-device-up and local-filesystems targets,
meaning that if someone decides to use this upstart config then the
master/minion/syndic does not start on boot.

We don't deploy upstart configs in our RPMs, but this provides a working
upstart config file for those that wish to use it.
 2014-02-26 11:26:06 -06:00
Nahum Shalman
e62862f992 update documentation about SmartOS esky packaging 2014-02-25 19:27:39 -05:00
David Boucha
34a12d0929 bump windows installer version number 2014-02-25 09:58:34 -07:00
Niels Abspoel
f252aa2f29 Updated suse rpm specfiles for 2014-1 release 
removed symlinks to systemd service files now pypi tarball
includes pkg folder. Updated spec file to match these sources.
 2014-02-21 22:22:20 +01:00
Thomas S Hatch
655da0bd5c Merge pull request #10638 from terminalmage/rpm 
Update spec file for 2014.1.0
 2014-02-20 20:38:16 -07:00
Erik Johnson
3007e6882c Update spec file for 2014.1.0 2014-02-20 21:06:10 -06:00
Mike Place
a485eceac9 Fix all broken links in docs. Ignore certain known-good links. Adjust many links that are returning 301. 
Conflicts:
	doc/topics/installation/index.rst
 2014-02-20 16:16:59 -07:00
Tom Atkinson
4c87afbdc8 Fix service restart over salt 2014-02-18 20:37:53 +01:00
David Boucha
b44e681c5c release 0.17.5 Windows installers 2014-02-14 01:45:48 -07:00
Erik Johnson
708a95ddf4 Update RPM spec for 0.17.5 2014-01-27 15:54:26 -06:00
Alexey Ivanov
d23ff3821e
codespell: grammar nazi 
Run codespell[1] against sources.

[1] https://github.com/lucasdemarchi/codespell
 2014-01-26 18:41:28 -08:00
Niels Abspoel
ba4d1d54b0 updated suse rpm to 0.17.5 2014-01-25 22:18:01 +01:00
Nahum Shalman
3c179c2a41 SmartOS esky packaging: minor fixup 
Don't assume that the top directory is named "salt"
The user might choose to name it "salt-<version>"
or "saltstack" or whatever else.

install.sh is already that flexible; this fixes _syspaths.py
 2014-01-24 09:47:37 -05:00
Nahum Shalman
9f2a19ef05 SmartOS Esky Packaging: Fix PATH for services 
We ran into some weird issues with these SMF manifests
with certain critical binaries not being found in the PATH.

This PATH is derived from root's default PATH when logging
in to a SmartOS zone.
 2014-01-23 15:31:44 -05:00
Nathan Rini
73a839d637 Fix bug to allow for multiple PIDs to be returned 
Bug:
```
[root@pronghorn04 ~]# service salt-minion restart
Stopping salt-minion daemon:                               [  OK  ]
Starting salt-minion daemon: /etc/init.d/salt-minion: line 67: [: 22610:
unary operator expected
                                                           [  OK  ]
```

Traced bug:
```
++ pidof -c -o 21702 -o 21341 -o %PPID -x salt-minion
+ '[' 22610 7606 ']'
/etc/init.d/salt-minion: line 67: [: 22610: unary operator expected
```
 2014-01-15 15:50:41 -07:00
Michael Birtwell
9100506a64 Fix pkg/rpm/build.py when it's a release candidate 
Uses version.py to generate the complete version string
 2014-01-09 15:45:40 -07:00
Michael Birtwell
ead7af6fa0 Correctly filter the rpm SOURCES 2014-01-09 15:45:33 -07:00
Thomas S Hatch
ad526c972f Merge pull request #9588 from dmyerscough/fix-init-script 
Fix init script
 2014-01-06 10:47:56 -08:00
Damian Myerscough
65cde36f94 Fix #9511 multiple PID's cause unary operator expected 2014-01-06 19:46:33 +01:00
Damian Myerscough
c6ed4980dc Fix #9511 multiple PID's cause unary operator expected 2014-01-06 19:41:34 +01:00
Nahum Shalman
e94f42449a SmartOS esky build tooling 
This includes:
Notes on how I created a build environment
The _syspaths.py that allows the esky build to be installed anywhere
"Template" SMF manifests and an install script to import them
A script for building both the esky zip and a deployable tarball
 2014-01-05 11:20:24 -05:00
David Boucha
21c3ff1c70 bump Salt windows installer version 2013-12-26 10:40:19 -07:00
Niels Abspoel
7c817b4035 updated suse spec to 0.17.4 2013-12-25 08:42:09 +01:00
Erik Johnson
9718b9d024 Update RPM spec for 0.17.4 2013-12-19 11:33:02 -06:00
Matthew Williams
f89a3a466c syndic upstart: invoke via su so /etc/environment is read 2013-12-04 19:17:01 -08:00
Matthew Williams
2f1d42638f upstart scripts: invoke via su so /etc/environment is read 2013-12-04 19:09:59 -08:00
Mathieu Le Marec - Pasquet
5f46962e80 pep8 fixes 2013-12-04 00:25:50 +00:00
Thomas S Hatch
ae06ed74b3 Minor clean up on convenience rpm building function 2013-12-02 11:10:03 -07:00
Thomas S Hatch
e70b605471 Merge branch 'rpm_build_helper' of git://github.com/mbirtwell/salt into mbirtwell-rpm_build_helper 
Conflicts:
	pkg/rpm/salt.spec
 2013-12-02 11:07:59 -07:00
Erik Johnson
1ce0b5b5fa Remove unnecessary build requirement 2013-11-18 21:20:29 -06:00
Erik Johnson
d5604b3629 Update spec file for 0.17.2 2013-11-18 20:53:29 -06:00
Michael Birtwell
9879de8da7 Make buildid a argument 2013-11-13 14:58:30 +00:00
Michael Birtwell
b4e5114689 Add some stuff to make building rpms easier 
Conflicts:
	pkg/rpm/salt.spec
 2013-11-13 14:58:00 +00:00
Seth House
4f00fa256b Fixed occurances of "Salt Stack" to SaltStack 2013-11-07 10:46:41 -07:00
Niels Abspoel
a4e2da99a8 updated suse spec file for salt-api 0.8.3 2013-11-04 23:00:20 +01:00
Niels Abspoel
47b6a803e2 updated salt spec file for 0.17.1 
disabled unit testing until next version broken with salt-testing 0.5.2
 2013-11-04 22:55:08 +01:00
C. R. Oldham
8e53d5ff80 Back out earlier fix. 2013-10-31 17:04:58 -06:00
C. R. Oldham
5c58d4f245 Fix #4410, make sure that "ssh root@host -C service salt-minio restart" will return. 2013-10-25 17:20:10 -06:00
Wari Wahab
d2094f8b60 Fixed all typos I can find 2013-10-25 16:26:57 +08:00
David Boucha
ba0abb6810 Merge pull request #8073 from equinoxefr/update_nsis_installer 
Removing nsProcess plugin.
 2013-10-24 09:58:55 -07:00
EquinoxeFR
34c6f6c831 Removing nsProcess plugin. Using ExecWait and a sleep 3s to stop salt-minion. 2013-10-24 15:19:21 +02:00
Niels Abspoel
c349f1cbb2 updated suse spec to salt 0.17.1 2013-10-23 07:50:21 +02:00
Erik Johnson
1a884c59f1 Update RPM spec for 0.17.1 2013-10-22 15:28:49 -05:00
EquinoxeFR
f6ca119edc Adding close process and service stop to windows installer 2013-10-22 12:12:02 +02:00
David Anderson
6ef835899a Upstart scripts can source a virtualenv 2013-10-18 11:56:32 -06:00
David Boucha
746369d7b6 Bump Salt Windows installer version. Add to docs 2013-10-18 01:24:37 -06:00
David Boucha
45724660fb Bump windows installer version number 2013-10-08 11:31:19 -06:00
Erik Johnson
e75fc016fd pip not needed for EPEL5 package 2013-09-30 21:56:49 -05:00
Erik Johnson
d310dcbb80 Update initscripts, spec file for 0.17.0 
This also fixes an issue with sourcing of /etc/rc.d/init.d/functions in
RHEL/CentOS/Fedora/etc., allowing the use of /etc/default/salt to
override environment variables.
 2013-09-30 21:09:25 -05:00
Niels Abspoel
5ae7fb1b53 updated suse pkg, inline with package guidelines 2013-09-28 23:16:06 +02:00
Niels Abspoel
4677b0a2c0 updated suse spec to salt 0.17.0 
created salt-ssh as a separate package
improved dependencies per package
salt-master depends pyzmq and recommends halite
salt-minion depends pyzmq
salt dependency pyzmq removed.
 2013-09-27 21:58:18 +02:00