Merge pull request #37162 from rallytime/bp-36823

Back-port #36823 to 2015.8
This commit is contained in:
Nicole Thomas 2016-10-22 07:52:53 -06:00 committed by GitHub
commit 35b4494157
7 changed files with 9 additions and 15 deletions

View file

@ -3,13 +3,10 @@ Description=REST API for Salt
After=network.target
[Service]
EnvironmentFile=/etc/default/salt-api
LimitNOFILE=8192
Type=simple
Type=notify
NotifyAccess=all
ExecStart=/usr/bin/salt-api
KillMode=process
Restart=$RESTART
[Install]
WantedBy=multi-user.target

View file

@ -3,13 +3,10 @@ Description=The Salt Master daemon
After=network.target
[Service]
EnvironmentFile=/etc/default/salt-master
LimitNOFILE=16384
Type=simple
Type=notify
NotifyAccess=all
ExecStart=/usr/bin/salt-master
KillMode=process
Restart=$RESTART
[Install]
WantedBy=multi-user.target

View file

@ -3,12 +3,10 @@ Description=The Salt Minion daemon
After=network.target
[Service]
EnvironmentFile=/etc/default/salt-minion
Type=simple
Type=notify
NotifyAccess=all
LimitNOFILE=8192
ExecStart=/usr/bin/salt-minion
KillMode=process
Restart=$RESTART
[Install]
WantedBy=multi-user.target

View file

@ -3,11 +3,10 @@ Description=The Salt Syndic daemon
After=network.target
[Service]
EnvironmentFile=/etc/default/salt-syndic
Type=simple
Type=notify
NotifyAccess=all
LimitNOFILE=8192
ExecStart=/usr/bin/salt-syndic
Restart=$RESTART
[Install]
WantedBy=multi-user.target

View file

@ -4,6 +4,7 @@ After=network.target
[Service]
Type=notify
NotifyAccess=all
LimitNOFILE=8192
ExecStart=/usr/bin/salt-api
TimeoutStopSec=3

View file

@ -4,6 +4,7 @@ After=network.target
[Service]
Type=notify
NotifyAccess=all
LimitNOFILE=8192
ExecStart=/usr/bin/salt-minion

View file

@ -4,6 +4,7 @@ After=network.target
[Service]
Type=notify
NotifyAccess=all
LimitNOFILE=8192
ExecStart=/usr/bin/salt-syndic