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 pull request #27878 from rallytime/fix-26284

Browse source 
Use apache2ctl binary on SUSE in apache module
This commit is contained in:
Mike Place 2015-10-13 08:45:56 -06:00
commit 97da0a87e3
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/modules/apache.py
View file

@ -49,9 +49,10 @@ def _detect_os():
Apache commands and paths differ depending on packaging
'''
# TODO: Add pillar support for the apachectl location
if __grains__['os_family'] == 'RedHat':
os_family = __grains__['os_family']
if os_family == 'RedHat':
return 'apachectl'
elif __grains__['os_family'] == 'Debian':
elif os_family == 'Debian' or os_family == 'Suse':
return 'apache2ctl'
else:
return 'apachectl'