Erik Johnson
33a74e422e
Update Fedora/RHEL spec for 2014.1.13
2014-10-17 10:46:14 -05:00
Erik Johnson
b18ae95f84
Update RPM spec for 2014.1.11
2014-10-01 18:35:23 -05:00
Thomas S Hatch
2f6ae96f37
Merge branch '2014.7' into develop
...
Conflicts:
salt/client/ssh/__init__.py
2014-09-03 14:43:07 -06:00
Erik Johnson
cbdee403bd
Add salt-api unit file symlink
2014-09-03 13:42:21 -05:00
Erik Johnson
17049624ea
Fix incorrect conditional in spec
2014-08-10 12:20:30 -05:00
Erik Johnson
5f9931636a
Deploy /var/cache/salt with common RPM
...
Also changed the deprecated $RPM_BUILD_ROOT to %{buildroot}.
2014-08-05 22:15:34 -05:00
Erik Johnson
670e315c19
Update RPM spec for 2014.1.10
2014-08-05 17:02:35 -05:00
Seth House
95f31c591d
Fix 'stop' for RedHat salt-api init script
2014-07-21 20:46:26 -06:00
Erik Johnson
1197a06716
Update spec for 2014.1.7
2014-07-10 20:52:00 -06:00
Thomas S Hatch
199b2bc2a9
Merge pull request #13895 from jeteokeeffe/patch-2
...
Adding logrotate script for salt in rpm
2014-07-02 10:16:47 -06:00
Jete
31c3267e59
Adding logrotate script for salt in rpm
2014-07-01 17:05:27 -04:00
Jete
323de1e833
Adding logrotate file
...
Adding logrotate file for salt logs
2014-07-01 17:02:20 -04:00
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
Seth House
53bab586f4
Merged salt-api into Salt
...
Woot!
The conflicts below are intentional because they contained salt-api-isms
that needed to be included into the corresponding Salt files.
Conflicts:
debian/changelog
debian/control
doc/conf.py
doc/index.rst
opt_requirements.txt
salt/config.py
salt/loader.py
2014-06-18 22:13:56 -06:00
Seth House
210ecf4a50
Moved salt-api.spec file to corresponding Salt-core directory
2014-06-18 19:25:56 -06:00
Erik Johnson
82960a7480
Update RPM spec for 2014.1.4
2014-05-10 00:06:33 -05:00
Erik Johnson
5ed7be5b2e
Update spec file for 2014.1.3
2014-04-18 18:19:14 -05:00
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
Seth House
3113ad190e
Merge pull request #114 from sfdc-kho/develop
...
Fix start/stop in init script
2013-08-30 23:03:40 -07:00
Kim Ho
1de8f9686e
Fix start/stop in init script
2013-08-30 11:03:16 -07: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
Niels Abspoel
8da9e9a116
updated suse spec file
...
Made a symlink to salt-api init file used for rpm
updated symlink to salt-api.service
Improved salt-api rpm to be in line with lsb for suse inclusion.
2013-08-09 22:56:36 +02:00
Clint Savage
a1729fb373
updating spec file to feature release 0.16.0
2013-07-11 17:13:00 -06:00
pengyao
4fedff1b69
Add "-d" options to start salt-api
...
In RHEL/CentOS, daemon should start in daemon mode, The salt-api will
start in frontgroud without "-d" options.
2013-06-28 21:08:55 +08: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
