Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Preussal patch 2 #114

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Preussal patch 2 #114

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6af84e6
Merge pull request #2 from preussal/patch-1
Mar 31, 2020
6918e4d
Merge branch 'patch-1'
Mar 31, 2020
984b8d6
Merge branch 'patch-1'
Mar 31, 2020
ad45f67
Merge pull request #3 from saltstack-formulas/master
May 26, 2020
58b8735
Update context.sls
May 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions tomcat/context.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ include:

{% if tomcat.get('sites', False) %}

#Tomcat fails if pillar-defined webapps are not deployed yet.
#Create the missing 'appBase' directories so Tomcat works!
# Tomcat fails if pillar-defined webapps are not deployed yet.
# Create the missing 'appBase' directories so Tomcat works!

{% for id, data in tomcat.get('sites', {}).items() %}
{% for k, v in data.items() %}
{% if k == 'appBase' %}
tomcat {{ tomcat.catalina_home }}/webapps/{{ data['appBase'] }}:
tomcat {{ tomcat.catalina_home }}/{{ data['appBase'] }}:
file.directory:
- name: {{ tomcat.catalina_home }}/webapps/{{ data['appBase'] }}
- name: {{ tomcat.catalina_home }}/{{ data['appBase'] }}
{% if grains.os != 'MacOS' %}
#Inherit logged-on user permissions on Darwin
# Inherit logged-on user permissions on Darwin
- user: root
- group: {{ tomcat.group }}
{% endif %}
Expand All @@ -24,12 +24,12 @@ tomcat {{ tomcat.catalina_home }}/webapps/{{ data['appBase'] }}:
- require_in:
- file: tomcat {{ tomcat.conf_dir }}/context.xml

#Tomcat fails if pillar-defined webapps are not deployed yet.
# if catalina_base != catalina_home
{% if tomcat.catalina_base != tomcat.catalina_home %}
tomcat {{ tomcat.catalina_base }}/webapps/{{ data['appBase'] }}:
# Tomcat fails if pillar-defined appBase are not deployed yet.
# Create the missing 'appBase' directories so Tomcat works!
tomcat {{ tomcat.catalina_base }}/{{ data['appBase'] }}:
file.directory:
- name: {{ tomcat.catalina_base }}/webapps/{{ data['appBase'] }}
- name: {{ tomcat.catalina_base }}/{{ data['appBase'] }}
{% if grains.os != 'MacOS' %}
#Inherit logged-on user permissions on Darwin
- user: {{ tomcat.user }}
Expand All @@ -40,6 +40,7 @@ tomcat {{ tomcat.catalina_base }}/webapps/{{ data['appBase'] }}:
- require_in:
- file: tomcat {{ tomcat.conf_dir }}/context.xml
{% endif %}

{% endif %}
{% endfor %}
{% endfor %}
Expand Down