Commit Graph

83 Commits

Author SHA1 Message Date
Erik Johnson
3007e6882c Update spec file for 2014.1.0 2014-02-20 21:06:10 -06:00
Tom Atkinson
4c87afbdc8 Fix service restart over salt 2014-02-18 20:37:53 +01:00
Erik Johnson
708a95ddf4 Update RPM spec for 0.17.5 2014-01-27 15:54:26 -06:00
Nathan Rini
73a839d637 Fix bug to allow for multiple PIDs to be returned
Bug:
```
[root@pronghorn04 ~]# service salt-minion restart
Stopping salt-minion daemon:                               [  OK  ]
Starting salt-minion daemon: /etc/init.d/salt-minion: line 67: [: 22610:
unary operator expected
                                                           [  OK  ]
```

Traced bug:
```
++ pidof -c -o 21702 -o 21341 -o %PPID -x salt-minion
+ '[' 22610 7606 ']'
/etc/init.d/salt-minion: line 67: [: 22610: unary operator expected
```
2014-01-15 15:50:41 -07:00
Michael Birtwell
9100506a64 Fix pkg/rpm/build.py when it's a release candidate
Uses version.py to generate the complete version string
2014-01-09 15:45:40 -07:00
Michael Birtwell
ead7af6fa0 Correctly filter the rpm SOURCES 2014-01-09 15:45:33 -07:00
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
Erik Johnson
9718b9d024 Update RPM spec for 0.17.4 2013-12-19 11:33:02 -06:00
Mathieu Le Marec - Pasquet
5f46962e80 pep8 fixes 2013-12-04 00:25:50 +00:00
Thomas S Hatch
ae06ed74b3 Minor clean up on convenience rpm building function 2013-12-02 11:10:03 -07:00
Thomas S Hatch
e70b605471 Merge branch 'rpm_build_helper' of git://github.com/mbirtwell/salt into mbirtwell-rpm_build_helper
Conflicts:
	pkg/rpm/salt.spec
2013-12-02 11:07:59 -07:00
Erik Johnson
1ce0b5b5fa Remove unnecessary build requirement 2013-11-18 21:20:29 -06:00
Erik Johnson
d5604b3629 Update spec file for 0.17.2 2013-11-18 20:53:29 -06:00
Michael Birtwell
9879de8da7 Make buildid a argument 2013-11-13 14:58:30 +00:00
Michael Birtwell
b4e5114689 Add some stuff to make building rpms easier
Conflicts:
	pkg/rpm/salt.spec
2013-11-13 14:58:00 +00:00
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
1a884c59f1 Update RPM spec for 0.17.1 2013-10-22 15:28:49 -05:00
Erik Johnson
e75fc016fd pip not needed for EPEL5 package 2013-09-30 21:56:49 -05:00
Erik Johnson
d310dcbb80 Update initscripts, spec file for 0.17.0
This also fixes an issue with sourcing of /etc/rc.d/init.d/functions in
RHEL/CentOS/Fedora/etc., allowing the use of /etc/default/salt to
override environment variables.
2013-09-30 21:09:25 -05:00
Erik Johnson
186c929c51 Fix sanity checks and defaults file sourcing 2013-09-13 12:48:50 -05:00
Erik Johnson
8376fd5284 Updated with 0.16.4-1 info 2013-09-13 12:47:20 -05:00
David Anderson
cabb8230f3 Fix https://github.com/saltstack/salt/issues/6785 2013-09-11 14:14:14 -06:00
Florian La Roche
d9e11967a0 fixed preun/postun scripts for salt-minion for the Red Hat .spec file 2013-08-26 21:12:08 +02:00
Andrew Niemantsverdriet
c53e3717b0 Updating to version 0.16.3 2013-08-15 14:08:38 -06:00
Clint Savage
3deff7ac21 update rpm spec to 0.16.2 2013-08-10 12:12:48 -06:00
Clint Savage
a1729fb373 updating spec file to feature release 0.16.0 2013-07-11 17:13:00 -06:00
Erik Johnson
524cc8bbb7 Add dependency on yum-utils
This adds the depedency on yum-utils to to the RPM spec, as necessitated
by the change made to yumpkg5.py in 8f77216.
2013-06-06 14:44:46 -05:00
Clint Savage
972c8772fd update rpm spec to patch release 0.15.3 2013-06-01 22:35:13 -06:00
Clint Savage
5b7c166d51 version needs to be 0.15.2 for salt.spec 2013-06-01 02:26:03 -06:00
Clint Savage
d408ee67eb fixup dumb merge issues 2013-05-31 17:27:18 -06:00
Clint Savage
f5ac79fb37 upstream patch release 0.15.2 and patch to make tests run properly 2013-05-31 17:25:21 -06:00
Clint Savage
1013ea8e26 update rpm spec to patch release 0.15.1 2013-05-09 14:01:10 -06:00
Clint Savage
076a3a60be update spec to 0.15.0 2013-05-07 11:29:50 -06:00
Clint Savage
8aff76178f add 0.14.1 rpm spec 2013-05-04 14:11:37 -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
7264bbc29e update salt.spec to 0.14.0 2013-03-24 17:16:42 -06:00
Clint Savage
a67bace68a update rpm spec to patch release 0.13.3 2013-03-22 16:38:45 -06:00
Clint Savage
14198a2371 update rpm spec to 0.13.2 2013-03-20 02:37:52 -06: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
Thomas S Hatch
09d48efc3f update rpm spec version 2013-02-12 11:14:03 -07:00
Clint Savage
b76fa41378 Remove patches and update to upstream patch release 0.12.1 2013-02-07 16:36:10 -07:00
David Lindquist
7cec8e54b6 Fix import typo in rpm build patch 2013-01-25 15:08:31 -08:00
Wendall Cada
9ed9dd07b4 Added unittest support to rpm spec. 2013-01-17 20:08:33 -08:00
Clint Savage
97bb52bd5d fixup salt.spec for 0.12.0 2013-01-17 19:17:18 -07:00
Clint Savage
9bdc993f46 moving to new upstream version 0.12.0 2013-01-16 11:26:34 -07:00