valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
45,075 Commits 24 Branches 182 Tags 341 MiB
438ede78ba
Commit Graph

19 Commits

Author SHA1 Message Date
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
Tom Atkinson
4c87afbdc8 Fix service restart over salt 2014-02-18 20:37:53 +01: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
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
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
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
Erik Johnson
186c929c51 Fix sanity checks and defaults file sourcing 2013-09-13 12:48:50 -05:00
David Anderson
cabb8230f3 Fix https://github.com/saltstack/salt/issues/6785 2013-09-11 14:14:14 -06:00
deniskin82
39221190fe Fix in init script for RHEL/CentOS. Don't start the salt-minion if it's already running and there is no PID file 2013-05-03 16:18:42 -04:00
David Lindquist
73dc0874c2 service.start salt-minion hangs from console on CentOS 
Fixes #4410
 2013-04-06 14:59:28 -07:00
Clint Savage
fe22763da0 update the start / kill order with chkconfig 2013-02-13 11:17:33 -07:00
Henrik Holmboe
4fa8e63033 Fix the LSB header 
I got complaints from insserv that the LSB header was not compliant. It was
missing required keywords, which must be there even if they are empty.
 2013-02-13 16:32:49 +01:00
Henrik Holmboe
464ca9dd1f Allow alternative executables 
With this commit it is possible to use virtualenv with the init scripts.

For example, I have this in my /etc/default/salt:

```
SALTMASTER=/srv/venvs/venv-1/bin/salt-master
SALTMINION=/srv/venvs/venv-1/bin/salt-minion
SALTSYNDIC=/srv/venvs/venv-1/bin/salt-syndic
SALTAPI=/srv/venvs/venv-1/bin/salt-api
PYTHON=/srv/venvs/venv-1/bin/python
```
 2013-02-13 15:30:13 +01:00
Mike Chesnut
ce3e1ca09c changing locations of python and salt binaries to be variables in init scripts; also changing how daemon functio nis called so it uses the full path 2012-05-10 13:41:50 -07:00
Clint Savage
d45f1ad998 SysV and rpmlint clean up 2012-01-08 20:28:30 -07:00
Thomas S Hatch
0ba610a719 The spec file and init scripts build rpms that run ton f15 and SL6 2011-07-13 23:15:34 -06:00
Thomas S Hatch
5b334894c7 Add rpm stuff 2011-04-02 23:02:48 -06:00