Commit Graph

131 Commits

Author SHA1 Message Date
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
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
Andrew Niemantsvedriet
b60382600a Start in daemon mode by default 2013-05-07 09:53:18 -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
61adf94187 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:36:15 +01: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
97335f61f1 Add an init script
This is a straight adaption of the salt-master init script (plus my recent
patch to it in holmboe/salt@464ca9dd1f).
2013-02-13 15:43:10 +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
Clint Savage
45b2eb1cc8 updated to 0.11.1 for security vulnerability fix 2012-12-20 10:24:41 -07:00
Clint Savage
5b14ee387d updated rpm spec to upstream release 0.11.0 2012-12-14 10:17:34 -07:00
Clint Savage
a02ad59941 fixup rpm pkg to include my changes. updated change by mchestnut to 0.10.5-2 even though it won't be built 2012-12-14 09:24:29 -07:00
Mike Chesnut
673b409e07 removing references to config tampltes in spec file 2012-12-05 12:14:06 -08:00
Clint Savage
78eb411a40 fixed some indentation that doesn't work in f18 2012-10-29 00:09:46 -06:00
Ivoz
0a071e479c Move systemd service files to a separate directory
Since service files might be used by many distros (arch, rpm-based,
gentoo, mindriva, mageia) I think it would be useful to symlink to
standard ones (and copy and edit them if differences are needed).
2012-10-26 09:45:33 +11:00
Clint Savage
48fe835c16 Updating spec to 0.10.4, patching bug #2335 (RHBZ#869669) 2012-10-24 12:08:28 -06:00
Clint Savage
0086c9d48c moved salt.spec to 0.10.3 and added systemd scriptlets 2012-10-03 10:29:00 -06:00
Clint Savage
2b010adb3d repackage with patch to fix #1730 2012-08-02 11:20:11 -06:00
Clint Savage
aca084a0ac moved RPM to 0.10.2 2012-08-02 09:45:24 -06:00
Clint Savage
53a03d8d59 updated spec to 0.10.1 2012-07-16 17:39:38 -06: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
7955098f29 updated salt.spec to use 0.9.9.1 2012-05-08 14:01:11 -06:00
Clint Savage
e1321c5093 rpm to 0.9.8 2012-04-03 13:03:23 -06:00
Clint Savage
e67ea3b98d Merge branch 'master' of git://github.com/saltstack/salt 2012-03-21 16:15:49 -06:00
Clint Savage
bb1029d989 updated with dmidecode 2012-03-21 16:13:42 -06:00
Thomas S Hatch
fce9bd3e13 clean up leftover line in salt spec 2012-02-20 08:40:52 -07:00
Clint Savage
064f98b5ef fixed the previous spec file which fails to build due to missing .template files 2012-01-24 15:36:11 -07:00
Clint Savage
4b8e92d788 updated to work with 0.9.6 2012-01-24 15:16:30 -07:00
Clint Savage
d45f1ad998 SysV and rpmlint clean up 2012-01-08 20:28:30 -07:00
Clint Savage
201c1d4558 Cleaning up perms, group and descriptions, adding %post and %postun for systemd 2012-01-07 22:56:48 -07:00
Clint Savage
02c2051493 Updating for systemd on Fedora 15+ 2012-01-06 00:26:37 -07:00
Thomas S Hatch
0af8e1c183 Add initial systemd files 2012-01-04 15:27:42 -07:00
Clint Savage
1ec4aa8c3a adding updated spec for rpm 2011-12-04 21:39:28 -07:00
Clint Savage
aecf6c0b72 new and improved salt.spec which creates salt, salt-master and salt-minion rpms 2011-09-17 16:39:45 -06:00
Thomas S Hatch
0d365e0f43 Update the salt spec file 2011-08-31 18:11:19 -06:00
Thomas S Hatch
69719abd3e Add salt syndic initscript 2011-08-31 18:00:33 -06:00
Erik Nolte
1d71c9ce19 Move remaining salt-monitor code to the salt-monitor project 2011-08-10 13:54:38 -06:00
Erik Nolte
2fc1664a21 Add /etc/rc.d and /etc/init.d scripts to start and stop the salt monitor. 2011-07-27 19:18:07 -06: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
c426d7538c prep spec file for salt rpms 2011-07-13 20:42:06 -06:00
Thomas S Hatch
a001c70e1c update the rpm spec file for 0.8.7 2011-05-13 23:00:58 -06:00
Thomas S Hatch
5b334894c7 Add rpm stuff 2011-04-02 23:02:48 -06:00