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

Merge pull request #15955 from rallytime/bp-15666

Browse Source 
Backport #15666 to 2014.7
This commit is contained in:
Thomas S Hatch 2014-09-19 09:50:45 -06:00
commit c897907b4a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/modules/tomcat.py
View File

@ -72,9 +72,11 @@ def __catalina_home():
'''
locations = ['/usr/share/tomcat*', '/opt/tomcat']
for location in locations:
catalina_home = glob.glob(location)
if catalina_home:
return catalina_home[-1]
folders = glob.glob(location)
if folders:
for catalina_home in folders:
if os.path.isdir(catalina_home + "/bin"):
return catalina_home
return False