Colton Myers
9673fd0937
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/cloud/clouds/ec2.py
tests/unit/states/file_test.py
2015-12-08 12:23:26 -07: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
Damian Myerscough
85a8a3b033
Fix resource limits, systemd sets the default number of open files to 4096 causing te master to complain about limits when you have a large number of keys
2015-12-05 00:21:57 -08:00
Colton Myers
0d90dd3a19
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
debian/salt-master.service
salt/modules/win_pkg.py
2015-12-01 13:26:44 -07: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
Stephen Spencer
9980a251e4
At the very least there should be a comment of some sort indicating what
...
directive needs to be set.
2015-03-27 15:50:43 -05:00
Dennis Herbrich
f1a8a538fc
Fix typo in Type declaration of systemd unit
...
The systemd service type must be declared in lower case, otherwise systemd generated a warning and ignores the declaration.
2014-04-23 15:11:00 +02:00
Daniel Wallace
198e3eee8a
Yay systemd.daemon.notify
...
requires the python2 systemd bindings
2014-03-14 08:19:52 -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
