Commit Graph

896 Commits

Author SHA1 Message Date
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
rallytime
ced033c0a4 Merge branch '2016.3' into 'develop'
Conflicts:
  - doc/topics/releases/2016.3.0.rst
  - salt/scripts.py
  - salt/states/glusterfs.py
2016-05-06 16:05:58 -06:00
Shane Lee
f61cf6929a Add PyYAML with CLoader (#33079)
- Check for python before installing
- Update other dependencies to the latest
2016-05-06 08:28:03 -07:00
rallytime
16c9ce70ad Merge branch '2016.3' into 'develop'
No conflicts.
2016-05-02 12:58:24 -06:00
Shane Lee
ae32f17b82 Add salt-config script to Mac Installer (#32873)
* Add script to configure salt

* Add salt-config.sh to installer scripts

* Add additional information to welcome/conclusion

* Fix text in conclusion

* Make salt-config.sh executable

* Create symlink to salt-config.sh

* Create minion.d directory

* Fix changed comparison to determine restart

* Add -f option to symlink creation
2016-04-29 11:01:20 -07:00
rallytime
5952e3e300 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/mac_brew.py
  - salt/states/archive.py
2016-04-28 15:35:34 -06:00
Shane Lee
7da7b2329d Remove _get_date_time_format function (#32903)
* Remove _get_date_time_format function

* Fix incorrect timelib version
2016-04-28 10:06:44 -06:00
rallytime
cbf42a8407 Merge branch '2016.3' into 'develop'
Conflicts:
  - conf/master
  - doc/ref/configuration/master.rst
  - salt/cli/batch.py
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/minion.py
  - salt/modules/aptpkg.py
  - salt/modules/beacons.py
  - salt/states/archive.py
  - salt/states/cmd.py
  - salt/utils/gitfs.py
  - tests/unit/states/cmd_test.py
2016-04-26 14:42:26 -06:00
Shane Lee
25df973d4c Added pycurl to windows dependencies (#32731) 2016-04-25 11:13:10 -06:00
Shane Lee
8de1c6c094 Add debugging options to mac service configs (#32789) 2016-04-25 11:06:30 -06:00
Shane Lee
c657f3d829 Remove additional unneeded files and dirs (#32790) 2016-04-25 09:23:47 -06:00
Shane Lee
13f18beefc Add license information for pip modules (#32738)
* Adds readme file for license information

* Add special requirements modules
2016-04-21 08:12:04 -06:00
Nicole Thomas
9942ea9319 [develop] Merge forward from 2016.3 to develop (#32636)
* Ensure rh_service not used on CloudLinux 7

Add CloudLinux to RHEL-derived distros excluded from rh_service use in osrelease >= 7

* Fix binary search and replace (#32542)

* Don't return None from eval_master (#32555)

Raise an exception instead. Because eval master if returns should return
a tuple.

* redact passwords and hashes from user.present updates

Fixes #32381

* Better log message on minion restart if master couldn't be reached. (#32576)

* Revert PR #32480 and apply #32314 with fixes / documentation (#32558)

* Revert "Fix loop in maint.flo"

This reverts commit 5196cd6a6e5db3c7b1a47b1740881bbd3e87ea3d.

* Revert "Clear VCS fsbackend and git_pillar locks on master start"

This reverts commit 7e3caa9bae1ac4de62db9924374e35a8b826937e.

* Revert "Add functions to remove VCS fsbackend update locks and git_pillar update/checkout locks"

This reverts commit 4c2db32419022501eae2a695ec488693e043d189.

* prevent eternal gitfs lock due to process crash

* Use salt.utils.fopen() instead of open()

* Make pid locking work for more than just gitfs

Also, make logging more descriptive, to aid in troubleshooting.

* Add git_pillar_global_lock config option default value

* Document proper usage of {gitfs,git_pillar}_global_lock

* Fix comments value in salt.states.pkgrepo example (#32604)

'comments' option adds '#' automatically. Example contains `#http://mirror.centos.org/centos/$releasever/os/$basearch/` string which becomes prefixed with '##' in generated file.

* alphabetize directories for dynamic modules (#32599)

Also add engines and proxy minions to the list.

* Expand on the open-source vs open-core FAQ

* Language clarification.

* Fix some mistakes in the salt-ssh thin shell script (#32583)

* [[ is bash, not compatible with /bin/sh

* check if python command exists before calling it

* Deprecate 'user' and 'group' in state cmd (#32613)

* Remove unused 'group' argument

* Fix unit testing of cmd.mod_run_check without group arg

* Deprecate 'user/group' in cmd.run

* Deprecate 'user'/'group' in cmd.script

* Deprecate 'user' in cmd.wait

* Deprecate 'user'/'group' in cmd.wait_script

* Fix mod_run_check without 'group'

* Push deprecation back one release

* Fix mac_service and mac_system modules (#32587)

* Fix mac_service module

* Add integration tests for new functions

* Start will not enable the service beforehand

* Remove unused variables
2016-04-18 08:40:20 -06:00
Jeremy McMillan
e25281fd20 Issue32626 macports Portfile upgrade to 2015.8.8.2 (#32629)
* This is the 2015.8.5 Portfile distributed by MacPorts

* version to 2015.8.8.2 and use osx pkg LaunchDaemon.plist resources for master, api, syndic
2016-04-16 11:35:07 -06:00
rallytime
bbec183474 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/minion.py
  - salt/states/user.py
2016-04-15 13:58:50 -06:00
Shane Lee
d12a1c2b8d Fix binary search and replace (#32542) 2016-04-13 10:15:02 -06:00
rallytime
093d833ff1 Merge branch '2016.3' into 'develop'
Conflicts:
  - pkg/osx/build.sh
2016-04-05 15:38:58 -06:00
Erik Johnson
764af33faf Add salt.bash symlink 2016-04-04 16:53:56 -05:00
rallytime
eb6773823b Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/rh_service.py
2016-04-01 10:33:44 -06:00
twangboy
2e065e4a20 Fix documentation
Fix conflicts with parameters and default paths
2016-03-31 15:32:32 -06:00
twangboy
de4d66cdbf Fix build scripts for mac
Swap the order of the version and the temp dir parameters
Remove extra blank lines
Removed sourcing of additional scripts, use sudo
Additional Commenting
Fix typo (Evn vs Env)
Add check for Full XCode, errors if not installed
Add -L to curl command to handle redirects
Sudo -H for all sudo commands
Remove unnecessary symbolic link creation
2016-03-31 15:24:30 -06:00
rallytime
fa5e17b342 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/win_service.py
  - salt/modules/zypper.py
  - salt/states/pkgrepo.py
2016-03-30 15:33:13 -06:00
rallytime
d743f8cc4e Merge branch '2015.5' into '2015.8'
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/modules/aptpkg.py
  - salt/modules/zypper.py
  - salt/states/pkgrepo.py
2016-03-30 13:38:38 -06:00
twangboy
b7fcae97ce Create minion.d directory, fixes #31976 2016-03-29 14:17:24 -06:00
twangboy
6984d5a075 Update pip and setuptools using req-pip.txt 2016-03-28 18:39:24 -06:00
twangboy
94354c45de Fix upgrade pip 2016-03-28 18:27:36 -06:00
twangboy
733ef7c3e0 Make VC Compiler for Python install silently 2016-03-28 18:23:26 -06:00
twangboy
33735ada22 Fix VC for Python install 2016-03-28 18:21:58 -06:00
twangboy
2f957409ad Add timelib and prereqs for compiling
Add timelib==0.2.4 to req.txt
Add check for VC Compiler for python
Add installer for VC Compiler
2016-03-28 18:15:00 -06:00
rallytime
d684d49490 Merge branch '2016.3' into 'develop'
Conflicts:
  - doc/topics/releases/2015.5.10.rst
  - doc/topics/releases/2015.8.8.rst
2016-03-28 11:16:22 -06:00
twangboy
a0edabf210 Add /opt/salt/bin to PATH
uses files under paths.d
also removed legacy launchctl load command
2016-03-25 16:14:40 -06:00
twangboy
61a91175a9 Add /opt/salt/bin to path 2016-03-25 15:43:28 -06:00
rallytime
f6d9cdc633 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/ref/states/compiler_ordering.rst
  - doc/topics/installation/suse.rst
  - doc/topics/jobs/schedule.rst
  - doc/topics/targeting/grains.rst
  - doc/topics/tutorials/preseed_key.rst
  - doc/topics/tutorials/states_pt5.rst
  - pkg/suse/use-forking-daemon.patch
  - salt/minion.py
  - salt/modules/pacman.py
  - salt/modules/state.py
  - salt/modules/yumpkg.py
2016-03-25 11:47:16 -06:00
Justin Findlay
8de84b4251 update suse master service patch
Fixes #780.
2016-03-23 16:03:12 -06:00
twangboy
4af8c9dbfc Back port nullsoft build script from 2015.8 2016-03-16 17:57:04 -06:00
Christian McHugh
4000e68356 Create salt-proxy instantiated service file
Add a systemd service file for salt-proxy. 

Instantiate a new proxy service with proxyid=p8000:
# systemctl enable salt-proxy\@p8000.service
# systemctl start salt-proxy\@p8000.service
2016-03-10 13:25:01 -06:00
rallytime
7476076ea3 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/beacons/memusage.py
2016-03-07 14:13:14 -07:00
Jorge Schrauwen
8077fe3e19 drop M2Crypto from the SmartOS esky builds 2016-03-05 23:43:18 +00:00
Mike Place
8664d1201a Merge pull request #31636 from nshalman/pkg-osx
pkg/osx: build_pkg.sh needs to be called not sourced
2016-03-03 09:13:11 -07:00
Nahum Shalman
08a2863676 pkg/osx: build_pkg.sh needs to be called not sourced
If it's sourced it ignores the command line arguments
and that makes it fail.
2016-03-02 16:01:20 -05:00
rallytime
2ee175c6d3 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/fileclient.py
  - salt/modules/glusterfs.py
2016-03-02 13:48:11 -07:00
rallytime
031a75ca33 Merge branch '2015.8' into '2016.3'
Conflicts:
  - Contributing.rst
  - conf/master
  - doc/index.rst
  - doc/man/salt.7
  - pkg/suse/README.suse
  - salt/client/ssh/state.py
  - salt/minion.py
  - salt/modules/zypper.py
  - salt/utils/schedule.py
  - tests/unit/modules/zypper_test.py
2016-03-02 10:26:13 -07:00
Denys Havrysh
bbcad93a8d Fix trailing white spaces in Salt PRM spec file 2016-03-02 10:42:00 +02:00
Denys Havrysh
fbfc3abccf Remove trailing white spaces in files under pkg/ dir 2016-03-01 17:37:18 +02:00
twangboy
1f6a95694d Grant permissions using SID instead of name 2016-02-29 18:09:31 -07:00
rallytime
cc29092dcb Merge branch '2016.3' into 'develop' 2016-02-18 11:33:24 -07:00
Nahum Shalman
53561ff5fe pkg/osx: curl should follow redirects 2016-02-17 13:18:12 -05:00
twangboy
f7a9b09fb6 Move build files to salt/pkg/windows 2016-02-12 21:00:30 -07:00
rallytime
73d73e80c1 Merge branch '2016.3' into 'develop'
Conflicts:
  - doc/topics/releases/2015.8.4.rst
  - doc/topics/releases/2015.8.5.rst
  - doc/topics/thorium/index.rst
  - salt/cloud/clouds/opennebula.py
  - salt/engines/thorium.py
  - salt/loader.py
  - salt/modules/archive.py
  - salt/modules/boto_vpc.py
  - salt/modules/data.py
  - salt/modules/reg.py
  - salt/pillar/mysql.py
  - salt/runners/cache.py
  - salt/states/archive.py
  - salt/states/cron.py
  - salt/states/file.py
  - salt/states/glance.py
  - salt/states/reg.py
  - salt/thorium/__init__.py
  - salt/thorium/check.py
  - salt/thorium/file.py
  - salt/thorium/reg.py
  - salt/utils/jid.py
  - salt/utils/parsers.py
  - setup.py
2016-02-12 14:38:50 -07:00
Colton Myers
076b49a4ca Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3
Conflicts:
    README.rst
    doc/conf.py
    doc/ref/index.rst
    doc/ref/proxy/all/salt.proxy.ssh_sample.rst
    doc/topics/installation/rhel.rst
    doc/topics/releases/2015.8.4.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/opennebula.py
    salt/config/__init__.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_ec2.py
    salt/modules/boto_elasticache.py
    salt/modules/boto_elb.py
    salt/modules/boto_iam.py
    salt/modules/boto_rds.py
    salt/modules/boto_sns.py
    salt/modules/boto_sqs.py
    salt/modules/dracr.py
    salt/modules/git.py
    salt/modules/mine.py
    salt/modules/systemd.py
    salt/modules/win_pkg.py
    salt/modules/yumpkg.py
    salt/pillar/__init__.py
    salt/states/git.py
    salt/states/rabbitmq_vhost.py
    salt/states/saltmod.py
    salt/utils/pkg/rpm.py
    setup.py
    tests/unit/modules/systemd_test.py
    tests/unit/states/rabbitmq_vhost_test.py
2016-02-11 22:33:49 -07:00
Bo Maryniuk
f73f70375c Force-kill websocket's child processes faster than default two minutes. 2016-02-11 15:16:43 +01:00
Eric Cook
80dc92da1f zsh-completion: improve (module|runner).function name retrieval
parsing ''salt-call -d'' was pretty errorprone and it finally broke. :D
Documention for some cron.* file.* functions isn't formatted with
leading whitespace, thus are picked up by the completer.

So now the completer parses salt-call sys.list_(runner_|)functions
2016-02-09 14:12:25 -05:00
Mike Place
87f2816ef5 Merge pull request #31029 from twangboy/win_defaults
Windows defaults to multiprocessing true
2016-02-09 11:20:36 -07:00
twangboy
baffbbdb74 Comment multiprocessing line in minion config 2016-02-08 18:14:17 -07:00
twangboy
8876893b5c Fix remove placeholder files 2016-02-08 17:51:36 -07:00
twangboy
788855cc94 Remove placeholder files 2016-02-08 17:42:07 -07:00
twangboy
c834a9d5e5 Set overwrite to off
Remove place holder files (empty)
2016-02-08 17:29:39 -07:00
Jorge Schrauwen
4b9d052eb5 fix build on smartos #30968 2016-02-07 21:41:43 -07:00
Jorge Schrauwen
e24483b9b1 fix build on smartos #30968 2016-02-06 16:03:53 +00:00
twangboy
3654a0e0c2 Change 2015 to 2016 in license file 2016-02-05 09:37:46 -07:00
twangboy
aa7d0602a8 Update instructions in readme.md for shasum 2016-02-05 09:36:23 -07:00
twangboy
6f1a8f4146 Added code to add /opt/salt/bin to the path
remmed out
2016-02-05 09:36:02 -07:00
twangboy
1e7468a08c Disable master, syndic, and api in postinstall
I tried doing this through the plist files but no matter
what I did they would still start
2016-02-05 09:35:43 -07:00
twangboy
d49b3dcf1b Re-added start on load and keep alive 2016-02-05 09:35:15 -07:00
twangboy
3ff50a2254 Removed keepalive option 2016-02-05 09:35:01 -07:00
twangboy
eb5d04bdf1 Remove autostart for api, master, and syndic 2016-02-05 09:34:39 -07:00
twangboy
3c0cce34c9 Added minimum requirements for installation
64bit El Capitan
2016-02-05 09:34:15 -07:00