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

500 Commits

Author SHA1 Message Date
twangboy
0be53953af Added function to download and check hashes, added hash files 2015-12-22 13:08:23 -07:00
twangboy
7f0b87bfb3 Added pre/post flight scripts (not running) 2015-12-22 09:28:47 -07:00
twangboy
9eeb6da7bd Improvements to osx packaging scripts 2015-12-21 13:07:53 -07:00
Colton Myers
9673fd0937 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cloud/clouds/ec2.py
    tests/unit/states/file_test.py
 2015-12-08 12:23:26 -07:00
Benjamin Drung
b1a4ade618 Drop obsolete syslog.target from systemd services 
Declaring After=syslog.target is unnecessary by now because syslog is
socket-activated and will therefore be started when needed. Thus remove
the obsolete syslog.target from the systemd service files.
 2015-12-08 13:48:34 +01:00
Damian Myerscough
85a8a3b033 Fix resource limits, systemd sets the default number of open files to 4096 causing te master to complain about limits when you have a large number of keys 2015-12-05 00:21:57 -08:00
C. R. Oldham
8e191ae264 Add web references 2015-12-04 09:30:10 -07:00
C. R. Oldham
5f1459d708 Update mac packaging 2015-12-04 09:30:10 -07:00
C. R. Oldham
092b7ddd0a First crack at build files for Mac OS X Native package 2015-12-04 09:30:10 -07:00
Colton Myers
0d90dd3a19 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    debian/salt-master.service
    salt/modules/win_pkg.py
 2015-12-01 13:26:44 -07:00
twangboy
90b19a3279 Fixed the script... something got broke... 2015-11-04 10:53:10 -07:00
Benjamin Drung
89dcb66310 Fix the wrong "allow to do" phrase 
"allow to do" is not a valid English phrase. Either use a gerund (allow
doing) or add a patient/object (allow someone to do).
 2015-11-04 12:15:41 +01:00
Colton Myers
3286a5250f Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/installation/windows.rst
    doc/topics/tutorials/pillar.rst
    pkg/windows/installer/Salt-Minion-Setup.nsi
    salt/modules/file.py
    salt/modules/schedule.py
    salt/pillar/git_pillar.py
    salt/states/boto_route53.py
    salt/states/pkg.py
    tests/integration/modules/pillar.py
 2015-10-30 16:05:26 -06:00
twangboy
a0c5223554 Fixes #27923 and #28000 
Fixed a bug where the installer wouldn't grab current config if the salt
service was stopped
Added a switch to start the salt service at the end
Switch works with both silent and GUI installs
/start-service=1 will start the service
/start-service=0 will not start the service
Default is to start the service
 2015-10-27 15:43:22 -06:00
twangboy
63a7305ae9 Uninstaller only removes specific files and dirs 
Fixes: #27032

Uninstaller only removes the following:
- ./bin
- salt*
- nssm.exe
- uninst.exe

All other files will remain untouched
 2015-09-24 14:59:32 -06:00
twangboy
7e35b13022 Turned multiprocessing on 2015-09-11 08:10:52 -06:00
Jorge Schrauwen
9efef940c1 fix SPM paths on smartos/illumos esky 2015-08-28 21:42:44 +00:00
Colton Myers
d3d0e004d9 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/minion.py
    salt/modules/gpg.py
    salt/modules/keystone.py
    salt/modules/pw_user.py
    salt/states/reg.py
    setup.py
 2015-08-17 16:54:16 -06:00
Bastiaan Bakker
ec8d4b0470 test wether RETVAL is 0 with -eq rather than =. 2015-08-17 17:20:33 +02:00
Bastiaan Bakker
a83a5de41e fix issue #26161: on RedHat family systems touch /var/lock/subsys/$SERVICE to ensure the daemon will be stopped on shutdown. 2015-08-17 11:11:12 +02:00
Colton Myers
7b50807a12 Merge pull request #25902 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-03 14:30:07 -06:00
Jorge Schrauwen
ebb63f15a6 create log directory for smartos esky package 2015-07-31 16:34:02 +00:00
Colton Myers
e29be766bb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    debian/changelog
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/cloud/clouds/proxmox.py
    salt/cloud/clouds/vmware.py
    salt/config.py
    salt/fileclient.py
    salt/minion.py
    salt/modules/chocolatey.py
    salt/modules/localemod.py
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/schedule.py
    salt/modules/state.py
    salt/modules/win_file.py
    salt/modules/win_pkg.py
    salt/state.py
    salt/states/file.py
    salt/utils/args.py
    tests/unit/states/file_test.py
 2015-07-30 16:54:44 -06:00
Jorge Schrauwen
937779eb51 patchelf lives in pkgsrc 
alteast on base-64-lts 14.4.0 release
 2015-07-28 10:03:20 -06:00
Jorge Schrauwen
c825683363 cleanup of python requirements 
halite is deprecated, could requirements file got removed so importing it fails in the until loops.
 2015-07-27 09:04:23 -06:00
Colton Myers
2a144b954a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/states/requisites.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/config.py
    salt/minion.py
    salt/modules/cp.py
    salt/pillar/__init__.py
    salt/states/file.py
 2015-07-14 10:57:36 -06:00
twangboy
e61eeba48b Fixed problem with service not starting 2015-07-08 22:23:45 +00:00
Colton Myers
99fc7ecb4b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/man/salt-call.1
    doc/man/salt-cloud.1
    doc/man/salt-cp.1
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/fileclient.py
    salt/modules/file.py
    salt/modules/gpg.py
 2015-06-29 16:49:40 -06:00
Colton Myers
8d8bf3476f Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-06-24 11:12:15 -06:00
Bret Fisher
d7bfb0c7fd Smartos smf minion fix 
Per my own testing on dozens of SmartOS VM's and issue #473 "Problem
3", the salt-minion service manifest definition doesn't work. This
change fixes that. I think it may have broke in 2014.7 so back porting
to that ver.
 2015-06-23 22:34:07 -04:00
Colton Myers
725e5c689f Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-06-11 13:15:38 -06:00
Colton Myers
e1d45ccf3b Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-06-10 12:02:42 -06:00
twangboy
673e1d809e Added missing panel.bmp for installer 2015-06-09 10:28:09 -06:00
twangboy
cc50218b01 Start Minion Service on Silent Install 2015-06-09 09:34:41 -06:00
Colton Myers
5fcbcfe6d5 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/cloud/digitalocean.rst
    doc/topics/tutorials/index.rst
    salt/cloud/clouds/digital_ocean.py
    salt/modules/lxc.py
    salt/returners/__init__.py
 2015-05-29 17:33:28 -06:00
Justin Findlay
dac055dd8b Merge pull request #24252 from aboe76/opensuse_package 
Updated suse spec to 2015.5.1
 2015-05-29 15:38:45 -06:00
Colton Myers
c4f5e231fa Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2 
Conflicts:
    doc/_themes/saltstack2/layout.html
    doc/conf.py
    doc/index.rst
    doc/ref/modules/all/salt.modules.hipchat.rst
    doc/topics/releases/index.rst
    salt/client/ssh/client.py
    salt/cloud/clouds/vsphere.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_route53.py
    salt/modules/data.py
    salt/modules/http.py
    salt/modules/tls.py
    salt/output/compact.py
    salt/states/boto_elb.py
    salt/states/linux_acl.py
    salt/states/rabbitmq_user.py
    salt/states/win_servermanager.py
    salt/utils/dictupdate.py
    salt/wheel/config.py
 2015-05-29 15:10:13 -06:00
Niels Abspoel
0ad617df21 Updated suse spec to 2015.5.1 2015-05-29 20:26:31 +02:00
Ben Woodward
6632d06e94 Unset PYTHONHOME when starting the service 
Means that installing Python on the system shouldn't break Salt
 2015-05-29 15:28:35 +01:00
Colton Myers
e52b5ab2e2 Remove stray >>>>> 2015-05-26 15:51:56 -06:00
Niels Abspoel
3f65631cb6 updated suse spec file to version 2015.5.0 2015-05-16 10:57:46 -06:00
Sergey Kizunov
714dc95159 Adding missing .bat scripts for salt-master and friends 
Adding:
- salt-key.bat
- salt-master.bat
- salt-run.bat
- salt.bat

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2015-05-15 20:14:32 -05:00
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