saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '2015.8' into '2016.3'

Browse source 
No conflicts.
This commit is contained in:
rallytime 2016-08-18 14:44:12 -06:00
commit 00dff9dcbd
4 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/salt-api.service
View file

@ -3,7 +3,7 @@ Description=The Salt API
After=network.target
[Service]
Type=simple
Type=notify
LimitNOFILE=8192
ExecStart=/usr/bin/salt-api
TimeoutStopSec=3

1
pkg/salt-master.service
View file

@ -7,7 +7,6 @@ LimitNOFILE=16384
Type=notify
NotifyAccess=all
ExecStart=/usr/bin/salt-master
KillMode=process
[Install]
WantedBy=multi-user.target

3
pkg/salt-minion.service
View file

@ -3,10 +3,9 @@ Description=The Salt Minion
After=network.target
[Service]
Type=simple
Type=notify
LimitNOFILE=8192
ExecStart=/usr/bin/salt-minion
KillMode=process
[Install]
WantedBy=multi-user.target

2
pkg/salt-syndic.service
View file

@ -3,7 +3,7 @@ Description=The Salt Master Server
After=network.target
[Service]
Type=simple
Type=notify
LimitNOFILE=8192
ExecStart=/usr/bin/salt-syndic