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
99,096 Commits 24 Branches 182 Tags 341 MiB
678a75b2a1
Commit Graph

1062 Commits

Author SHA1 Message Date
twangboy
7b8d6cbbd2 Add support for Py3 2017-07-19 17:30:47 -06:00
twangboy
aa4eed93c8 Update Python and other reqs 2017-07-19 11:22:07 -06:00
twangboy
a7c910c31e Remove build and dist directories before install 2017-07-18 11:36:38 -06:00
twangboy
0946002713 Add blank line after delete 2017-07-18 11:28:49 -06:00
twangboy
f7c0bb4f46 Remove build and dist directories before install 2017-07-18 11:23:16 -06:00
rallytime
8d960d463a Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/grains/core.py
 2017-07-06 17:42:30 -06:00
Mike Place
41514b886e Merge pull request #42096 from twangboy/win_use_default_configs 
Use default salt configs for Windows installs
 2017-07-03 17:03:26 -05:00
twangboy
c1e899c0ca Create Master installer if script is found 2017-07-03 13:54:27 -06:00
twangboy
7da86b3540 Use default salt configs for Windows installs 2017-07-03 13:33:24 -06:00
twangboy
e4183a6d1c Fix comments 2017-07-03 10:27:04 -06:00
twangboy
984b736e14 Add missing batch file 2017-07-03 10:24:10 -06:00
rallytime
e512a29f08 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/state.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/pkg.py
  - salt/version.py
  - tests/unit/config/test_config.py
  - tests/unit/modules/test_zypper.py
 2017-06-28 11:31:53 -06:00
Pablo Suárez Hernández
30b12da58b Enables salt-minion watchdog on init.d script for sysV 2017-06-20 17:28:40 +01:00
Michael Calmer
db295f6f06 special salt-minion.service file for rhel7 2017-06-20 17:28:39 +01:00
Silvio Moioli
22d884f478 Avoid failures on SLES 12 SP2 because of new systemd TaskMax limit (bsc#985112) 2017-06-20 17:28:39 +01:00
Michael Calmer
8c89378b0d Run salt-api as user salt (bsc#990029) 2017-06-20 17:28:38 +01:00
Klaus Kämpf
0cf36b487b Run salt master as dedicated salt user 
* Minion runs always as a root
 2017-06-20 17:13:00 +01:00
Klaus Kämpf
02b6d8ce42 tserong@suse.com -- We don't have python-systemd, so notify can't work 2017-06-20 17:09:14 +01:00
rallytime
add5b118a3 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/yumpkg.py
  - tests/unit/templates/test_jinja.py
 2017-06-19 14:12:36 -06:00
Mike Place
3cdd2fe96c Merge pull request #41701 from twangboy/remove_win_unicode_console 
Remove win_unicode_console dependency
 2017-06-19 11:57:12 -05:00
twangboy
8b4e3ad77d Upgrade psutil to version 5.2.2 2017-06-16 17:59:50 -06:00
rallytime
7fef4cf38f Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/engines/slack.py
 2017-06-15 10:57:27 -06:00
rallytime
16a2747d7d Merge branch '2016.11' into '2017.7' 
Conflicts:
  - pkg/windows/buildenv/salt.bat
  - salt/modules/pillar.py
  - salt/utils/openstack/nova.py
  - tests/unit/cloud/clouds/test_dimensiondata.py
  - tests/unit/cloud/clouds/test_gce.py
 2017-06-14 13:31:42 -06:00
rallytime
74d9a36d5a Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - pkg/salt-proxy@.service
  - salt/modules/npm.py
  - salt/modules/parted.py
  - tests/integration/modules/test_libcloud_dns.py
 2017-06-13 15:01:51 -06:00
twangboy
0d4be0220b Add batch files for master 2017-06-12 15:48:46 -06:00
Nicole Thomas
435d6189bf Merge pull request #41446 from cloudflare/proxy-file 
[backport] salt-proxy:  Fix systemd unit file to handle more proxy names
 2017-06-12 12:33:20 -06:00
twangboy
e8a24db927 Remove win_unicode_console dependency 2017-06-12 11:56:18 -06:00
rallytime
093f96f84e Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-06-08 16:45:34 -06:00
David Murphy
7ab3319090 Update notrim check, netstat takes minutes if large number connections - 260K 2017-06-07 10:47:06 -06:00
rallytime
396b06fdf8 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-06-07 09:54:20 -06:00
rallytime
1a40e105e5 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - tests/integration/__init__.py
  - tests/integration/modules/test_state.py
 2017-06-06 12:57:44 -06:00
David Murphy
ffe492d6a9 Add symbolic link salt-proxy service similar to other service files 2017-06-01 16:05:46 -06:00
rongzeng
bd0f3a4359 fixed salt-minion initd file bug 
if salt-minion has its grains, for using "salt-call --local config.get PARAM" get the right PARAM, should add "--skip-grains", or the script cant work normal.
 2017-06-01 14:37:01 +08:00
rallytime
ff417db115 Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - doc/topics/venafi/index.rst
  - pkg/salt-proxy@.service
  - salt/config/__init__.py
 2017-05-26 11:27:24 -06:00
Mircea Ulinic
0c1221ea7b Use the escaped name (%i) in the proxy description 2017-05-26 09:45:54 +00:00
Mircea Ulinic
ca6b07c415 Add salt-proxy service file to deb pkg 2017-05-26 09:38:11 +00:00
Jeremy McDermond
48f47e3925 salt-proxy: Fix systemd unit file to handle more proxy names 
The current systemd unit file uses %I which gives the unescaped argument
to the script.  This breaks if there are special characters in the proxy
name such as '-'.  Using %i escapes the name when it's handed to the command
line allowing the use of those characters.

This change also adds the argument to the template to the unit name so that
it's a bit easier to see in systemctl.

Conflicts:
	pkg/salt-proxy@.service
 2017-05-26 09:35:22 +00:00
Mike Place
525b26c2b4 Merge pull request #41418 from twangboy/rem_raet_deps 
Remove RAET dependencies from Windows Installer
 2017-05-25 16:03:42 -05:00
rallytime
9ff2694155 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - pkg/salt-minion.service
  - salt/modules/junos.py
  - salt/modules/localemod.py
  - salt/modules/win_system.py
  - salt/states/junos.py
  - tests/unit/modules/test_localemod.py
  - tests/unit/modules/test_win_powercfg.py
  - tests/unit/states/dockerng_test.py
 2017-05-24 16:32:59 -06:00
twangboy
c3a22dc0e7 Remove RAET deps, remove salt.bat 2017-05-24 16:22:43 -06:00
Mike Place
3a45ac30f0 Merge pull request #41401 from bdrung/systemd-service-documentation-key 
Add documentation key to systemd service files
 2017-05-24 10:49:54 -05:00
Benjamin Drung
33a7f8b2ec Fix typos 
lintian found several spelling errors.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2017-05-24 12:50:29 +02:00
Benjamin Drung
3f7f30895d Add documentation key to systemd service files 
Documentation for systemd service files can be automatically viewed
using systemctl help servicename if this field is present. Thus add the
relevant man page, the local and online documentation to the
documentation key.
 2017-05-24 11:14:39 +02:00
Mike Place
3d142213b0 Merge pull request #41304 from mcdermj/proxy-systemd-fix 
salt-proxy:  Fix systemd unit file to handle more proxy names
 2017-05-19 13:28:20 -05:00
Benedikt Heine
d54b893b71 convert whitespace tabs to spaces 2017-05-18 18:53:27 +02:00
Benedikt Heine
df290b7b09 expand tilde correctly in bashcompletion (fixes #41302) 2017-05-18 18:48:12 +02:00
Jeremy McDermond
72ce923fa1 salt-proxy: Fix systemd unit file to handle more proxy names 
The current systemd unit file uses %I which gives the unescaped argument
to the script.  This breaks if there are special characters in the proxy
name such as '-'.  Using %i escapes the name when it's handed to the command
line allowing the use of those characters.

This change also adds the argument to the template to the unit name so that
it's a bit easier to see in systemctl.
 2017-05-17 11:01:48 -07:00
rallytime
d75a7e0d0f Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-12 16:42:54 -06:00
Mike Place
c195d075cd Merge pull request #41151 from twangboy/fix_py_install 
Fix python 2.7.13 install, fix clean script
 2017-05-12 12:31:29 -05:00
rallytime
e1bd7ce10a Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-11 13:03:59 -06:00
rallytime
4100e2b6a6 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-10 15:32:33 -06:00
rallytime
12a75c1108 Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-05-10 15:32:23 -06:00
twangboy
96918dcfa6 Add silent action to MsgBox for Path Actions 2017-05-10 11:22:18 -06:00
Mike Place
d1882e42dd Merge pull request #40870 from twangboy/unicode_console 
[DO NOT MERGE] Add win_unicode_console dependency
 2017-05-09 13:09:20 -06:00
twangboy
53458b88e9 Fix python 2.7.13 install, fix clean script 2017-05-09 18:32:03 +00:00
rallytime
ecb962cdee Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/runners/saltutil.py
 2017-05-02 09:00:22 -06:00
twangboy
523316f0d7 Update Python and Deps 2017-04-28 17:19:15 -06:00
twangboy
fe20a576b5 Add win_unicode_console dep 2017-04-24 17:24:00 -06:00
rallytime
885419b3e7 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-17 13:27:58 -06:00
rallytime
9905eb7273 Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/netapi/__init__.py
 2017-04-14 10:50:31 -06:00
rallytime
f552dd63f3 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - pkg/windows/installer/Salt-Minion-Setup.nsi
  - tests/unit/states/test_tomcat.py
 2017-04-14 10:46:56 -06:00
twangboy
b6ac4aa86d Fix service for win10 update 2017-04-13 13:51:15 -06:00
rallytime
17efc7341c Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/win_wua.py
  - salt/netapi/rest_cherrypy/app.py
  - salt/version.py
  - tests/unit/states/grains_test.py
  - tests/unit/states/test_archive.py
 2017-04-13 10:14:51 -06:00
rallytime
5282ea2480 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-13 09:46:05 -06:00
rallytime
749840ce5f Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-11 15:11:46 -06:00
rallytime
e90622bc22 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/dockermod.py
  - salt/modules/file.py
 2017-04-11 15:03:34 -06:00
twangboy
0f7a81cd34 Keep network.py execution module 2017-04-11 14:13:31 -06:00
Matei Albu
ee911a74b4 suse specific changes to salt-api.service 
* run service under user salt
 * change type from notify to simple
 * set SHELL env var. When passing a ProxyCommand option to salt-ssh a valid $SHELL is needed execute the given command
 2017-04-11 09:19:23 +02:00
twangboy
f71d5cccde Copy pywin32 dlls to python directory 2017-04-10 23:51:11 +00:00
Denys Havrysh
dae34b30f9 Add OpenRC init scripts for bootstrapping Alpine Linux from Git 2017-04-10 11:52:56 +03:00
Thomas Deutschmann
a177d7f0a1
salt-minion.service: Start after salt-master.service 
On systems where you have both services, salt-master and salt-minion,
enabled, you want that salt-minion.service starts after
salt-master.service so that the minion will be able to connect to the
master on first attempt.
 2017-04-03 11:43:00 +02:00
twangboy
90e5022e82 Fix nsis script error 2017-03-31 15:12:41 -06:00
rallytime
52edbffc85 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/cache/all/index.rst
  - doc/topics/cache/index.rst
  - salt/cache/localfs.py
  - salt/modules/boto_rds.py
  - salt/roster/cloud.py
  - salt/states/virtualenv_mod.py
  - tests/integration/states/test_archive.py
  - tests/unit/modules/test_dockermod.py
  - tests/unit/states/dockerng_test.py
 2017-03-28 17:09:30 -06:00
rallytime
e77e86db3a Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-03-27 17:27:49 -06:00
twangboy
3207d670c5 Fix osx build 2017-03-27 14:52:19 -06:00
rallytime
dbf74330ec Merge branch '2016.11' into 'develop' 
Conflicts:
  - pkg/windows/req_base.txt
  - salt/modules/ssh.py
 2017-03-23 16:40:44 -06:00
rallytime
5c5b74b09a Merge branch '2016.3' into '2016.11' 
Conflicts:
  - pkg/windows/req.txt
 2017-03-22 17:20:58 -06:00
mguegan
a5b1d55c46 Fix ZMQ cython .so files linkage 2017-03-22 22:03:53 +01:00
mguegan
15359d1a33 Fix esky build-tarball shellscript for SmartOS 2016Q4-LTS 
- Add `libssp.so.0` (not sure of this one)
 - Copy libsodium/libzmq to the ld_library_path
 2017-03-22 19:28:53 +01:00
mguegan
340cbfec63 Update build instructions for esky / SmartOS (2016Q4 LTS) 
- Remove duplicates
 - Adding `-lssp` for fix linking of `console.exe` (bbfreeze)
 - Remove patchelf which will break bbfreeze `(version not found)`
 - Update to latest saltstack repository branch
 2017-03-22 19:25:14 +01:00
twangboy
6761527793 Update dependencies for PyOpenSSL 2017-03-21 11:03:20 -06:00
twangboy
5f75ca71dd Update dates in the env scripts 2017-03-11 22:21:40 -07:00
twangboy
02757db1e4 Add python 3 installer for Windows 2017-03-10 21:52:38 +00:00
cDR
6539dbdbca Do not use name resolving for --notrim check 
This causes a significant delay on servers with many open connections
 2017-03-06 09:06:20 -07:00
Pedro Algarvio
878e770088
Bump required SaltPyLint version 2017-03-06 15:28:58 +00:00
Joseph Hall
829f7008f1 Fill in a couple more spots 2017-03-02 05:27:20 -07:00
Pedro Algarvio
1dd7d8d88f
Require SaltPyLint >= v2017.2.22 
Minimal Python version for develop is now 2.7
 2017-02-22 12:15:31 +00:00
rallytime
c46f82c029 Merge branch '2016.11' into 'develop' 
Conflicts:
  - requirements/dev_python27.txt
  - requirements/dev_python34.txt
 2017-02-21 14:20:20 -07:00
rallytime
dda39d4e63 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/minion.py
  - salt/modules/file.py
  - salt/modules/grains.py
  - salt/utils/gitfs.py
 2017-02-16 12:18:46 -07:00
twangboy
8dd915dae4 Add salt icon to buildenv directory 2017-02-16 12:04:21 -07:00
twangboy
98d5cc3e1b Add additional tests to the Windows whitelist 2017-02-15 21:21:55 +00:00
twangboy
ef5078729a Capitalize the 'r' for 2008R2 2017-02-09 09:55:59 -07:00
twangboy
1b6bd634ac Require VCRedist on 2008R2 and below instead of 2008 2017-02-09 09:47:47 -07:00
rallytime
88cc195a2a Merge branch '2016.11' into 'develop' 
No conflicts.
 2017-02-03 10:58:55 -07:00
twangboy
5ff8a14317 Fix problem deleting files 2017-02-02 18:12:18 -07:00
twangboy
4524dd49d4 Remove files not needed by salt-minion 2017-02-02 17:20:12 -07:00
Mike Place
8a24cad919 Merge pull request #39004 from markuskramerIgitt/compile_offline3 
Compile offline3
 2017-02-02 13:20:38 -07:00
Mike Place
75bb1d88eb Merge pull request #39082 from bmwiedemann/systemdsleep 
Add salt-minion.sleep
 2017-02-01 11:57:42 -07:00
Mike Place
4cd698ca33 Merge pull request #39104 from githubcdr/develop 
Do not use name resolving for --notrim check
 2017-02-01 11:25:27 -07:00
cDR
351c039257 Do not use name resolving for --notrim check 
This causes a significant delay on servers with many open connections
 2017-02-01 11:02:10 +01:00
Bernhard M. Wiedemann
c2cef98747 Add salt-minion.sleep 
for use with systemd to be installed in
/usr/lib/systemd/system-sleep/salt-minion.sleep

To avoid stale minion-master connections as described in
https://bugzilla.opensuse.org/show_bug.cgi?id=1018791
 2017-01-31 22:04:04 +01:00
rallytime
8928436bdd Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/pillar/__init__.py
 2017-01-30 09:06:27 -07:00
markuskramerIgitt
b4aa2ffaab Option to compile the Salt-Minion installer offline 2017-01-27 22:52:21 +01:00
Mike Place
4b75dfac95 Merge pull request #38978 from sjorge/2016.11-bootstrap 
fixes saltstack/salt-bootstrap#1021
 2017-01-27 10:05:09 -07:00
rallytime
e91fcbeaac Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/minion.py
  - salt/modules/dockerng.py
  - salt/thorium/key.py
 2017-01-26 16:02:06 -07:00
rallytime
fdaa5ac1b0 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/master.py
  - salt/pillar/__init__.py
  - salt/utils/__init__.py
 2017-01-26 14:09:37 -07:00
Super-User
26eb35f99d fixes salt/salt-bootstrap#1021 2017-01-26 21:22:34 +01:00
twangboy
214e1cc598 Fix 64bit detection, vcredist only on <= 2008 2017-01-24 11:56:11 -07:00
twangboy
62e608b627 Update Jinja2 to 2.9.4 2017-01-24 09:44:23 -07:00
Nicole Thomas
1262fa8ef8 Merge pull request #38843 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-01-20 14:01:12 -07:00
Mike Place
12118fa4eb Merge pull request #38794 from markuskramerIgitt/develop 
Test availability of git in the command shell.
 2017-01-20 13:43:40 -07:00
rallytime
3f74d697b9 Merge branch '2016.11' into 'develop' 
Conflicts:
  - pkg/windows/build_pkg.bat
  - salt/modules/archive.py
 2017-01-20 12:07:19 -07:00
Mike Place
10a3d8b8dd Merge pull request #38726 from twangboy/vcredist 
Add VC Redist 2008 SP1 MFC to installer
 2017-01-19 12:13:41 -07:00
Bo Maryniuk
eb25e2f768 Add a salt-minion service control file 2017-01-18 15:38:53 +01:00
markuskramerIgitt
b25542a66d Version must be set 2017-01-18 02:09:04 +01:00
twangboy
f00a65355d change extensions .ext to .exe 2017-01-17 17:55:18 -07:00
markuskramerIgitt
559bee31f9 no pause 2017-01-17 23:02:10 +01:00
markuskramerIgitt
a789241c0c Add test for git, omit cls to show result of tests. 2017-01-17 22:58:21 +01:00
rallytime
5b43a252c9 Merge branch '2016.11' into 'develop' 
Conflicts:
  - conf/master
  - doc/topics/installation/ubuntu.rst
  - salt/modules/pillar.py
  - salt/netapi/rest_tornado/saltnado.py
  - salt/states/influxdb_user.py
  - salt/utils/minions.py
  - salt/utils/openstack/nova.py
 2017-01-17 09:50:06 -07:00
rallytime
30e8a66fb0 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/netapi/rest_tornado/saltnado.py
  - tests/integration/netapi/rest_tornado/test_app.py
 2017-01-16 18:54:14 -07:00
twangboy
98c40e278c Add VC Redist 2008 SP1 MFC to installer 2017-01-13 12:42:39 -07:00
twangboy
e0c7e5549b Update jinja2 to 2.9.4 2017-01-11 11:10:46 -07:00
rallytime
9ad362fbde Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/states/kapacitor.py
 2017-01-03 10:17:18 -05:00
twangboy
e96bfe8fa2 Change OSX/OS X to macOS where possible 2016-12-28 14:49:46 -07:00
rallytime
a2927226ea Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/modules/all/salt.modules.napalm_route.rst
  - doc/ref/modules/all/salt.modules.napalm_snmp.rst
  - doc/ref/modules/all/salt.modules.napalm_users.rst
  - doc/ref/states/all/salt.states.netsnmp.rst
  - doc/ref/states/all/salt.states.netusers.rst
  - salt/states/cron.py
 2016-12-22 12:15:06 -07:00
rallytime
efb8a8ddf5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - salt/config/__init__.py
  - salt/minion.py
 2016-12-22 10:39:14 -07:00
Michael Calmer
de6ec05ec0 add try-restart to fix autorestarting on SUSE systems 2016-12-21 10:31:18 +00:00
rallytime
494a06bee2 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-12-20 10:03:44 -07:00
Denys Havrysh
c94e798b8a SysV init script for rpm: get and show unique PIDs only 2016-12-14 12:31:42 +02:00
Denys Havrysh
8ff68c4128 Fix initscript for RHEL5 (SysV) to pick up proper python version 2016-11-29 16:23:48 +02:00
Mike Place
468dea6c42 Merge pull request #37858 from cournape/installers/osx/support-maverick 
FEAT: put back support for Maverick in OS X installer.
 2016-11-27 12:54:05 +02:00
David Cournapeau
dcc52ba08a BUG: fix copypasta in preinstall script. 2016-11-24 14:53:04 +00:00
David Cournapeau
6c55e1e7fa Revert "REF: use a variable to reference the pre/post install script output on OS X installer." 
This reverts commit 7180e5ec21.
 2016-11-24 14:52:03 +00:00
Sergey Kizunov
334535bbd3 Make build_pkg.bat work with Python 3.6/3.5/2.7 
Make `build_pkg.bat` and associated utility `portable.py`
compatible with Python 3.6, 3.5, and 2.7.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-11-23 14:24:55 -06:00
David Cournapeau
7180e5ec21 REF: use a variable to reference the pre/post install script output on OS X installer. 2016-11-23 11:48:18 +00:00
David Cournapeau
4265da7b53 BUG: use -w option when unloading salt minion launchd script. 2016-11-23 11:39:30 +00:00
David Cournapeau
8c7a88040f TYPO: fix typo in debug postinstall message in OSX installer. 2016-11-23 11:38:25 +00:00
David Cournapeau
0e8cf75680 FEAT: put back support for Maverick in OS X installer. 
As launchctl CLI interface changed on Yosemite, we execute the more
recent code for Yosemite and later, and introduced back the old code for
post/pre install scripts when running on Maverick.

Tested on Maverick (10.9.5).
 2016-11-23 11:34:42 +00:00
markuskramerIgitt
d594b19cc9 superceded with clean_env.bat 2016-11-18 03:19:12 +01:00
rallytime
5f4a73f880 Merge branch '2016.11' into 'develop' 
No conflicts.
 2016-11-16 08:55:22 -07:00
twangboy
08200d2ee8 Update pyzmq to version 16.0.1 2016-11-14 17:12:59 -07:00
twangboy
cf55342150 Update pyzmq to version 15.3.0 2016-11-14 17:11:20 -07:00
rallytime
7b2341bbfd Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/topics/releases/releasecandidate.rst
  - salt/modules/file.py
  - salt/states/file.py
  - salt/utils/network.py
 2016-11-10 15:59:51 -07:00
rallytime
3b56f8bce1 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/topics/event/master_events.rst
 2016-11-07 08:13:57 -07:00
Michael Calmer
1fb2c4dfcf fix status handling in sysv init scripts 2016-11-06 18:49:12 +01:00
rallytime
9b3e4414c8 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - pkg/windows/modules/get-settings.psm1
  - salt/modules/mac_power.py
  - salt/modules/win_dsc.py
  - salt/modules/win_servermanager.py
  - salt/states/file.py
  - salt/utils/event.py
  - salt/utils/gitfs.py
 2016-11-04 15:23:49 -06:00
Mike Place
edbfadca21 Merge pull request #37442 from twangboy/fix_osx_postinstall 
Create paths.d directory
 2016-11-04 17:07:19 +13:00
twangboy
2de69f48f8 Detect VC for Python correctly on 32bit Windows 2016-11-03 18:23:19 +00:00
twangboy
8091a3065e Create paths.d directory 2016-11-03 09:27:50 -06:00
rallytime
70851807bd Merge branch 'carbon' into 'develop' 
Conflicts:
  - salt/modules/status.py
 2016-10-24 09:35:00 -06:00
Mike Place
3a3838eed9 Merge pull request #37166 from aphor/macports 
upgrade macports salt to v2016.11
 2016-10-24 11:41:18 +09:00
Jeremy McMillan
3cdddcbc87 upgrade macports salt to v2016.11 2016-10-22 11:04:50 -05:00
rallytime
caa8fc9169 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - pkg/deb/salt-api.service
  - pkg/deb/salt-master.service
  - salt/client/__init__.py
  - salt/fileclient.py
  - salt/modules/cp.py
  - salt/modules/status.py
  - tests/integration/__init__.py
  - tests/integration/modules/cp.py
 2016-10-21 15:50:03 -06:00
Erik Johnson
fb6e545f78 Use NotifyAccess=all in all unit files 
When systemd-python is not installed, systemd notification falls back to
using the systemd-notify for service notification. This cannot be used
however unless the unit has NotifyAccess=all set.

The particular use case for this is when Salt is installed using pip. We
don't put systemd-python into the requirements.txt because we can't be
sure that the minion supports systemd, so pip installs won't necessarily
have systemd-python available.
 2016-10-19 12:50:30 -05:00
Erik Johnson
0ccf789172 Remove EnvironmentFile and Restart lines from unit files 
These shouldn't be there, because the variables sourced by the
EnvironmentFile are only made available to the Exec commands in the unit
file.
 2016-10-07 12:33:04 -05:00
Erik Johnson
ddd44e9b13 Use Type=notify for debian systemd units 2016-10-06 09:14:50 -05:00
Robert James Hernandez
036d73f31b Use control-group default for killmode 2016-10-05 10:49:37 -07:00
Mike Place
34007be671
Merge branch 'carbon' into carbon_develop 2016-10-06 00:23:22 +09:00
twangboy
9afed88ed0 Update docs, change final dialog 2016-10-04 16:14:13 -06:00
twangboy
b3083cb139 Add delayed start option to minion service 2016-10-04 14:18:42 -06:00
twangboy
2d697b30c6 Add lxml to deps for Windows (used by win_lgpo) 2016-10-03 17:35:11 -06:00
Mike Place
7b43d4322c
Merge branch '2016.3' into 2016_3_carbon 2016-09-27 16:44:42 +09:00
twangboy
5fc63a1054 Add pyOpenSSL to req file for Windows 2016-09-26 17:35:28 -06:00
twangboy
3baeb2974d Add Estimated Size for Add/Remove Programs 2016-08-24 18:11:49 +00:00
twangboy
2ef1e00888 Add master build package build 2016-08-23 22:41:18 +00:00
twangboy
a3495d0852 Add minion only script 2016-08-23 22:37:17 +00:00
rallytime
b80ef26cf2 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/cli/batch.py
  - salt/minion.py
  - salt/modules/cassandra_cql.py
  - salt/modules/rsync.py
 2016-08-23 10:44:55 -06:00
twangboy
3d6d473d48 Revert to vcredist 12 (2013) 2016-08-22 17:57:14 -06:00
twangboy
10af191a4d Revert to vcredist 12 (2013) 2016-08-22 17:38:50 -06:00
Mike Place
1fb2c03e88 Merge pull request #35474 from twangboy/fix_windows_installer 
Hide minion config page, add master config file
 2016-08-20 12:11:37 +09:00
rallytime
00dff9dcbd Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-18 14:44:12 -06:00
Erik Johnson
6cb0fb47f3 pkg/salt-syndic.service: change Type to notify 2016-08-18 14:45:46 -05:00
Erik Johnson
175ba99e0e pkg/salt-minion.service: remove KillMode, change Type to notify 2016-08-18 14:44:51 -05:00
Erik Johnson
540ec28954 pkg/salt-master.service: remove KillMode 2016-08-18 14:44:19 -05:00
Erik Johnson
69fad464ab pkg/salt-api.service: change Type to notify 2016-08-18 14:43:50 -05:00
rallytime
d2340a0aad Merge branch '2016.3' into 'develop' 
Conflicts:
  - pkg/windows/build.bat
  - pkg/windows/build_pkg.bat
  - tests/runtests.py
 2016-08-17 12:13:26 -06:00
Nicole Thomas
e86a39a115 Merge pull request #35516 from rallytime/bp-34441 
Back-port #34441 to 2016.3
 2016-08-17 09:47:23 -06:00
markuskramerIgitt
32da48df08 setup.py will not print each individual file 2016-08-17 08:35:44 -06:00
markuskramerIgitt
698a076a39 Completely remove Python and verify 2016-08-17 08:35:44 -06:00
markuskramerIgitt
7406bd22a6 Errors will stop the scripts 2016-08-17 08:35:44 -06:00
markuskramerIgitt
e47c661cb0 Copy and delete silently, do not list each file 2016-08-17 08:34:06 -06:00
twangboy
c20803de07 Hide minion config page, add master config file 2016-08-15 22:53:27 +00:00
twangboy
d120a8906f Add vcredist 14 dlls 2016-08-10 18:56:08 +00:00
twangboy
00eff0a1a8 Fix architecture detection 2016-08-09 21:26:57 +00:00
twangboy
153b674fc5 Detect 32/64 bit installation 2016-08-09 21:09:36 +00:00
twangboy
23fbc7890c Fix previous version detection 2016-08-09 20:57:33 +00:00
twangboy
e661540526 Fix VC Compiler detection for 32bit Windows 2016-08-09 20:44:47 +00:00
twangboy
978775714b More standardization 2016-08-09 20:11:45 +00:00
twangboy
5787e27af1 Standardize build scripts 2016-08-09 19:53:55 +00:00
twangboy
99ac8acce6 Add path to Python Scripts to build.bat 2016-08-09 19:27:28 +00:00
twangboy
4f78bb0f34 Add path, fix uninstaller 2016-08-09 18:58:58 +00:00
twangboy
8e056168a4 Add function for adding to the path 2016-08-09 17:23:49 +00:00
twangboy
418e649be7 Fix App Paths entries 2016-08-09 17:23:49 +00:00
twangboy
d453199b56 Fix services not starting correctly, use nsExec 2016-08-09 17:23:48 +00:00
twangboy
cc88e50a42 Add Salt-Master to installer 2016-08-09 17:23:47 +00:00
twangboy
9218278873 Fix Title/Subtitle on Minion Config page 2016-08-09 17:23:47 +00:00
twangboy
a860580c79 Change GUID for python 2.7.12 2016-08-09 17:23:47 +00:00
twangboy
31ffb8f6e5 Add dependency dlls to script 2016-08-09 17:23:46 +00:00
twangboy
4149f0c237 Update pip requirements 2016-08-09 17:23:46 +00:00
Shane Lee
17a3b23ff8 Use Python 2.7.12 for Windows Build (#34468) 2016-07-06 17:29:50 -04:00
Shane Lee
858e5c1772 Update Python to 2.7.12 for Mac (#34493) 2016-07-06 17:10:53 -04:00
Thayne Harbaugh
aab8e23975 Minor tweaks/improvements to the salt-minion SysV init script. 
* Test "reload" before probing minion configuration
* change indent
 2016-07-28 12:12:45 -06:00
Benedikt Heine
5c45ac10e3 [bash-completion] remove old comment 2016-07-26 23:56:56 +02:00
Benedikt Heine
db58e62b0d [bash-completion] split modules and functions completion 
change behavior to complete modules and functions separately. This helps
gaining overview during completion.
 2016-07-26 23:56:56 +02:00
Benedikt Heine
99871f4c33 [bash-completion] cache function completions 
Cache the function completions. This may be neccessary if timeout is too
high and therefore you may get stuck on your input line.
 2016-07-26 23:56:56 +02:00
Mike Place
b29d3c95a8 Merge pull request #34932 from bebehei/fix-hide-timeout 
[bash-completion] hide timeout in salt-output
 2016-07-26 11:18:59 -06:00
Benedikt Heine
3cd47297ed [bashcompletion] replace ticks with bash subshell 2016-07-26 14:58:59 +02:00
Benedikt Heine
9091f0bffa [bashcompletion] ignore salt-key headers 2016-07-26 14:56:20 +02:00
Benedikt Heine
a7b400e923 [bash-completion] hide timeout in salt-output 
hide timeout and not corrupt the output of salt, when
show_timeout is set in master config
 2016-07-25 21:19:02 +02:00
Mike Place
bb0c7118ba Merge pull request #34502 from markuskramerIgitt/develop 
Windows installer build scripts will exit on error
 2016-07-07 16:05:31 -06:00
markuskramerIgitt
d87277ef89 setup.py will not print each individual file 2016-07-07 23:57:28 +02:00
rallytime
86b7c71e09 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/glusterfs.py
  - salt/states/pkg.py
 2016-07-07 13:37:58 -06:00
markuskramerIgitt
44025e123e Merge branch 'develop' of https://github.com/markuskramerIgitt/salt into develop 2016-07-07 01:29:54 +02:00
markuskramerIgitt
eed5b61dad Completely remove Python and verify 2016-07-07 01:17:16 +02:00
markuskramerIgitt
d464447b86 Errors will stop the scripts 2016-07-07 00:18:01 +02:00
Mike Place
516f494565 Merge pull request #34441 from markuskramerIgitt/develop 
Copy and delete silently, do not list each file
 2016-07-05 22:02:51 -06:00
markuskramerIgitt
7257b8d832 Copy and delete silently, do not list each file 2016-07-02 22:36:49 +02:00
markuskramerIgitt
994d1a3e6a Added description to nsi salt-minion service. 2016-06-22 16:37:55 +02:00
rallytime
9d049e28e5 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/win_pkg.py
  - salt/states/disk.py
 2016-06-15 17:13:26 -06:00
Shane Lee
f9bfcde61f Always make changes to minion config if set (#34020) 2016-06-15 12:53:53 -04:00
Shane Lee
e4a7190a1d Always make chanes to minion config if set (#34021) 2016-06-15 12:53:42 -04:00
Shane Lee
38e82fb89e Always make changes to minion config if set (#34022) 2016-06-15 12:53:19 -04:00
twangboy
dd7d55afb9 Use full path to python.exe 2016-06-13 12:01:15 -06:00
Mike Place
b9b19b2ca3 Merge pull request #33914 from babilen/salt-api-terminate-cgroup 
Remove KillMode=process from salt-api unit file
 2016-06-10 08:17:39 -07:00
Nicole Thomas
c71b1c0f5c Merge pull request #33913 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-06-09 19:02:28 -04:00
Wolodja Wentland
4763b79479 Remove KillMode=process from salt-api unit file 
Restarting the salt-api service should also terminate processes in the
same context group to ensure that they are being stopped cleanly.
 2016-06-09 21:25:35 +02:00
rallytime
f078d57b57 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/rabbitmq.py
  - salt/modules/win_servermanager.py
  - salt/state.py
  - salt/states/boto_s3_bucket.py
  - salt/states/pip_state.py
  - salt/states/win_servermanager.py
  - tests/unit/modules/win_servermanager_test.py
  - tests/unit/states/dockerng_test.py
 2016-06-09 13:06:10 -06:00
Erik Johnson
62edce685f Merge pull request #33792 from babilen/salt-master-terminate-cgroup 
Do not use KillMode=process for salt-master
 2016-06-09 13:18:56 -05:00
Nicole Thomas
08a584b3e5 Merge pull request #33711 from rallytime/merge-develop-3 
[develop] Merge forward from 2016.3 to develop
 2016-06-09 14:12:48 -04:00
Wolodja Wentland
7975ce009a Do not use KillMode=process for salt-master 
We actually want salt-master processes in the same control group to be
terminated and this was only introduced to fix the 'minion upgrades
itself' problem, which applies to salt-minion, but not to salt-master.

This change was introduced in d288539 to fix #29295, which discusses the
need to include 'KillMode=process' for the salt-minion on Debian
systems.
 2016-06-06 15:36:47 +02:00
EYJ
beea8cc376 Fix millisecond formatting to avoid 1000 as four-digit milliseconds 2016-06-02 17:43:27 +02:00
rallytime
9220ea0729 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - salt/minion.py
  - salt/modules/mac_brew.py
  - salt/modules/pkgng.py
  - salt/states/apache_module.py
  - salt/states/ini_manage.py
  - salt/states/win_servermanager.py
 2016-06-02 10:13:34 -04:00
Clayton Burlison
b483d1d8a6 Update mac native package for upcoming release 
This solves an issue where the package `resources` and package `scripts` were being added to the root of the install drive.

Change Spelling for:
* xCode to XCode
* and capitalize Command Line Tools

to match Apple's offical documentation.

Ref: https://developer.apple.com/xcode/
and https://developer.apple.com/library/ios/technotes/tn2339/_index.html
 2016-06-01 23:32:23 -05:00
Jorge Schrauwen
1064102394 add no-wheel, instructions were failing for someone testing due to wheel being used nog producing an egg 2016-05-28 19:00:42 +02:00
Jorge Schrauwen
c85e03ecf7 allow for newer pyzmq in esky packages 2016-05-28 16:08:04 +00:00
Jorge Schrauwen
1620b8c0fa allow esky packages to be build on base64 2015Q4 2016-05-28 13:59:14 +00:00
Drew Adams
bcd6a1cd77 fix osfamily from Suse to SUSE 2016-05-26 22:08:40 -07:00
Mike Place
3a95f8a977 Merge pull request #33509 from twangboy/fix_arch 
Detect System Architecture for Mac Build
 2016-05-26 07:40:54 -07:00
Salt Admin
7844059dcf Handle system architecture 2016-05-25 14:11:12 -06:00
rallytime
a5e0141eda Merge branch '2015.8' into '2106.3' 
Conflicts:
  - salt/beacons/__init__.py
  - salt/modules/saltutil.py
  - salt/modules/zypper.py
  - salt/states/grains.py
  - salt/states/pkgrepo.py
  - salt/states/service.py
 2016-05-25 13:44:21 -06:00
twangboy
7d78e5d612 Fix build script where pip wouldn't work 2016-05-25 17:38:39 +00:00
Shane Lee
ca6e929ded Fix libsodium for 32bit windows (#33455) 
* Add platform specific libsodium dlls

* Update libnacl to 1.4.5
 2016-05-24 08:11:44 -07:00
Bo Maryniuk
3b12f396b4 Prevent several minion processes on the same machine (#33464) 2016-05-24 07:37:03 -07:00
Nicole Thomas
336fbb03bc [develop] Merge forward from 2016.3 to develop (#33408) 
* Fix master hanging after a request from minion with removed key. (#33333)

* ZMQ monitor for MWorker connections.

* Reauth minion if the key was removed on the master side.

* Allow concurrency mode in state runs if using sudo (#33325)

Closes #30130

* Disambiguate non-exact matches when checking if sysv service is enabled (#33324)

Fixes #33323

* remove redundant, incorrect sudo_runas config documentation (#33318)

* remove sudo_runas documentation

`sudo_runas` was renamed to `sudo_user` and the documentation was not
updated accordingly.

* conf/minion: update sudo_user description

The description from sudo_runas was better.

* import ps from psutil_compat in beacons (#33334)

* beacons.network_info: import gate psutil

* beacons.ps: import gate psutil

* Add docs for mine_functions config var (#33326)

* Add docs for mine_functions config var

* Note that mine_enabled essentially just doesn't add the mine
update function to the scheduler.

* Bp 28467 calm mine (#33327)

* make minion mine update behavior more configurable

* Add docs for mine_functions config var

* Remove config dup from mine config options

Refs #28467

* 2015.8 does not have _DFLT_MULTIPROCESSING_MODE

* This won't be in until 2015.8.10.

* Fix network.managed for windows (#33312)

* Fix some link errors in the test writing tutorial (#33347)

* Describes parameters in register_instances function (#33339)

* Fix UnboundLocalError in git.latest (#33340)

Resolves #32260.

* Expanded documentation for boto_elb state and module (#33341)

* Describes what happens when the CNAME parameter is given.

* Describes what the recognized attributes are for for ELBs.

* Properly detect newer Linux Mint distros (#33359)

* Properly detect newer Linux Mint distros

LMDE 2 and Linux Mint 17.3 changed the DISTRIB_ID in /etc/lsb-release to
``LinuxMint``, breaking OS detection for these distros.

This commit fixes that by adding an entry to the OS_NAME_MAP in the core
grains.

* Remove LinuxMint os_family from aptpkg.py

It is no longer necessary as the distro is now detected properly, which
will lead to an os_family of Debian.

* Update job_cache and keep_jobs docs to be more specific to their behavior (#33328)

* Update job_cache and keep_jobs docs to be more specific to their behavior

Also fixed a bug discovered when investigating job_cache/keep_jobs functionality
where the jid directory and files were removed by the cache cleaner, but not the
original jid clash detection directory created in /var/cache/salt/master/jobs/.

Fixes #29286

* Add testcase for the changes in the local_cache.clean_old_jobs func

* Mark tests as destructive

* Put destructive test decorator in correct location

* Remove mentions of windows not supporting pkgs param (#33361)

Fixes #33313

* Updates docs version to 2015.8.9
Adds note regarding the os grain on Mint Linux
Adds an FAQ regarding grains that change due to upstream changes

* revved 2015.8 branch to .9 in version selector

* Add initscripts, SystemD service units and environment files for Debian (#32857)

* Add note to docs about api settings for Hipchat API v2 (#33365)

Fixes #27779

* Add win_pkg to list of modules that support "version" in pkg.installed (#33362)

Fixes #32913

* Add note about name parameter in git_pillar docs (#33369)

Fixes #27737

* Better YAML syntax error handling (#33375)

Closes #26574

* Improve doc clarity for disable_modules documentation (#33379)

* Improve doc clarity for disable_modules documentation

* Additional clarification on blacklisted name

* maintain the fallabck because I am totally sick of this crap

* blast, put the try/except int he right place

* restore whitespace

* Fix traceback in logging for config validation (#33386)

* 2015.8.10 release notes

* Sync pillarstack to latest upstream version (#33391)

* Don't lay down all available opts (#33385)

* Don't lay down all available opts

* We need at least one opt in there

* Condense defaults

* Put the default hash type back
 2016-05-20 13:48:40 -07:00
rallytime
35ad788470 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - conf/minion
  - doc/ref/configuration/minion.rst
  - salt/modules/boto_elb.py
  - salt/modules/sudo.py
  - salt/states/boto_elb.py
  - salt/transport/zeromq.py
 2016-05-19 16:22:36 -06:00
Denys Havrysh
37e1930b6e Add initscripts, SystemD service units and environment files for Debian (#32857) 2016-05-19 13:10:02 -07:00
rallytime
c8b8d82745 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/proxy/junos.py
 2016-05-16 12:32:23 -06:00
Shane Lee
4c51d31cae Fix salt-config script for mac install (#33250) 2016-05-15 13:08:10 -07:00
Nicole Thomas
b6cf601722 Merge pull request #33103 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-05-09 13:24:25 -06:00
plastikos
0efbbcd17f * Improve init script: specifically manage salt configurations rather than arbitrary salt processes (#32666) 
* * Improve init script: specifically manage salt configurations rather than arbitrary salt processes

Unfortunately SysV init scripts tend to rummage through PIDs filtering for
appropriate processes to manage.  Unfortunately the filters are usually weak
and don't account for similar processes run by other users, PIDs of dead
processes being re-used for completely different executables, etc..  These
weaknesses can result in killing unrelated processes with potentially serious
results.

These improvements to the SysV init script is a complete rewrite with the
following improvements:

  * Specifically manage individual salt configurations rather than looking for
    salt minion-like processes.
  * Obtain salt minion information from the salt configuration - use the
    information to manage the specifically configured process.
  * Drop all of the platform-specific helper functions that allow the
    previously-mentioned weaknesses.

    + Unfortunately this means that the output information may not match the
      specific platform (this could easily be corrected).

  * Now can manage multiple salt processes started by different users

    + Unfortunately starts/stops/restarts as a group and is unable to manage
      them both as a group or as individual processes (this could easily be
      corrected)

The new initscript also allows various control variables to be overridden by
environment variables or through settings put in ``/etc/sysconf/salt`` or
``/etc/default/salt``.

:SALTMINION_DEBUG: Dump each line expansion before execution, output system
                   information on failure.  Default: unset

:SALTMINION_BINDIR: Location of ``salt-minion``, ``salt-call`` and other
                    executables.  Default: ``/usr/bin``

:SALTMINION_SYSCONFDIR: The parent directory for the ``salt`` configuration
                        directory and the ``sysconfig`` or ``default``
                        directory.

* Add lines that went missing in the rebase+squash
 2016-05-09 10:57:13 -07:00