Commit Graph

12 Commits

Author SHA1 Message Date
rallytime
9ff2694155 Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - pkg/salt-minion.service
  - salt/modules/junos.py
  - salt/modules/localemod.py
  - salt/modules/win_system.py
  - salt/states/junos.py
  - tests/unit/modules/test_localemod.py
  - tests/unit/modules/test_win_powercfg.py
  - tests/unit/states/dockerng_test.py
2017-05-24 16:32:59 -06:00
Benjamin Drung
3f7f30895d Add documentation key to systemd service files
Documentation for systemd service files can be automatically viewed
using systemctl help servicename if this field is present. Thus add the
relevant man page, the local and online documentation to the
documentation key.
2017-05-24 11:14:39 +02:00
Thomas Deutschmann
a177d7f0a1
salt-minion.service: Start after salt-master.service
On systems where you have both services, salt-master and salt-minion,
enabled, you want that salt-minion.service starts after
salt-master.service so that the minion will be able to connect to the
master on first attempt.
2017-04-03 11:43:00 +02:00
Erik Johnson
fb6e545f78 Use NotifyAccess=all in all unit files
When systemd-python is not installed, systemd notification falls back to
using the systemd-notify for service notification. This cannot be used
however unless the unit has NotifyAccess=all set.

The particular use case for this is when Salt is installed using pip. We
don't put systemd-python into the requirements.txt because we can't be
sure that the minion supports systemd, so pip installs won't necessarily
have systemd-python available.
2016-10-19 12:50:30 -05:00
Erik Johnson
175ba99e0e pkg/salt-minion.service: remove KillMode, change Type to notify 2016-08-18 14:44:51 -05:00
Benjamin Drung
b1a4ade618 Drop obsolete syslog.target from systemd services
Declaring After=syslog.target is unnecessary by now because syslog is
socket-activated and will therefore be started when needed. Thus remove
the obsolete syslog.target from the systemd service files.
2015-12-08 13:48:34 +01:00
Colton Myers
befb666623 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    salt/modules/mongodb.py
    salt/utils/http.py
    salt/utils/process.py
    tests/integration/__init__.py
2015-04-27 10:28:53 -06:00
Justin Findlay
3d575e29c4 set systemd service killMode to process for minion
Fixes #22993.

The change is only made for the minion process because, theoretically,
only the minion could create the problem described.  salt-master and
salt-syndic do not theoretically spawn non-salt processes during the
lifetime of their processes, whereas salt-minion does this by design.

The default behavior for systemd killMode seems to be control-group,
which means all processes that share the same control group as the
minion process will also be killed by systemd when the minion service is
stopped (killed).

It is reasonable to expect that activity done on a system by a salt
minion should persist beyond the lifetime of the minion process, so
let's not kill procs that the minion starts even when the minion exits.
2015-04-23 16:18:19 -06:00
Stephen Spencer
307ded4e98 salt-api.service:LimitNOFILE=8192
salt-master.service:LimitNOFILE=16384
salt-minion.service:LimitNOFILE=8192
salt-syndic.service:LimitNOFILE=8192
2015-03-30 13:32:07 -05:00
Thomas S Hatch
09f2239167 Change the systemd scripts to use simple instead of forking 2012-11-20 12:14:21 -07:00
Ivoz
63352e6fa4 Change systemd-started services to be daemonized 2012-10-26 09:51:41 +11: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