valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #35579 from rallytime/merge-2016.3

Browse Source 
[2016.3] Merge forward from 2015.8 to 2016.3
This commit is contained in:
Nicole Thomas 2016-08-18 16:00:41 -06:00 committed by GitHub
commit d1339fd9f5
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