Commit Graph

13 Commits

Author SHA1 Message Date
rallytime
031a75ca33 Merge branch '2015.8' into '2016.3'
Conflicts:
  - Contributing.rst
  - conf/master
  - doc/index.rst
  - doc/man/salt.7
  - pkg/suse/README.suse
  - salt/client/ssh/state.py
  - salt/minion.py
  - salt/modules/zypper.py
  - salt/utils/schedule.py
  - tests/unit/modules/zypper_test.py
2016-03-02 10:26:13 -07:00
Denys Havrysh
fbfc3abccf Remove trailing white spaces in files under pkg/ dir 2016-03-01 17:37:18 +02:00
Zach Malone
d8767959d6 Removing $? after "echo" for other startup scripts 2015-10-23 09:57:53 -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
Seth House
95f31c591d Fix 'stop' for RedHat salt-api init script 2014-07-21 20:46:26 -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
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
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
Andrew Niemantsvedriet
b60382600a Start in daemon mode by default 2013-05-07 09:53:18 -06: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
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