saltstack-formulas/apache-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #43 from artmoni/br_multiproxy

Browse Source 
Issue#41 configure multi proxypass configuration in vhost
Thank you!
This commit is contained in:
Florian Bittner 2015-03-11 23:15:49 +01:00
commit 77398445a9
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apache/vhosts/proxy.tmpl
View File

@ -19,11 +19,7 @@
'CustomLog': site.get('CustomLog', '{0}/{1}-access.log'.format(map.logdir, sitename)),
'ProxyPreserveHost': site.get('ProxyPreserveHost', 'On'),
'ProxyPassSource': site.get('ProxyPassSource', '/'),
'ProxyPassTarget': site.get('ProxyPassTarget', 'https://{0}'.format(sitename)),
'ProxyPassReverseSource': site.get('ProxyPassReverseSource', site.get('ProxyPassSource', '/')),
'ProxyPassReverseTarget': site.get('ProxyPassReverseTarget', site.get('ProxyPassTarget', 'https://{0}'.format(sitename))),
'ProxyRoute': site.get('ProxyRoute', {}),
} %}
<VirtualHost {{ vals.interface }}:{{ vals.port }}>
@ -39,9 +35,17 @@
{% if site.get('CustomLog') != False %}CustomLog {{ vals.CustomLog }} {{ vals.LogFormat }}{% endif %}
ProxyPreserveHost {{ vals.ProxyPreserveHost }}
ProxyPass {{ vals.ProxyPassSource }} {{ vals.ProxyPassTarget }}
ProxyPassReverse {{ vals.ProxyPassReverseSource }} {{ vals.ProxyPassReverseTarget }}
{% for proxy, proxyargs in reverse(vals.ProxyRoute.items()) %}
{% set proxyvals = {
'ProxyPassSource': proxyargs.get('ProxyPassSource', '/'),
'ProxyPassTarget': proxyargs.get('ProxyPassTarget', 'https://{0}'.format(sitename)),
'ProxyPassReverseSource': proxyargs.get('ProxyPassReverseSource', '/'),
'ProxyPassReverseTarget': proxyargs.get('ProxyPassReverseTarget', site.get('ProxyPassTarget', 'https://{0}'.format(sitename))),
} %}
######### {{proxy}} #########
ProxyPass {{ proxyvals.ProxyPassSource }} {{ proxyvals.ProxyPassTarget }}
ProxyPassReverse {{ proxyvals.ProxyPassReverseSource }} {{ proxyvals.ProxyPassReverseTarget }}
{% endfor %}
{% if site.get('Formula_Append') %}
{{ site.Formula_Append|indent(4) }}
{% endif %}

10
pillar.example
View File

@ -63,10 +63,12 @@ apache:
# if template is 'proxy.tmpl'
# ProxyPreserveHost: 'On'
# ProxyPassSource: '/'
# ProxyPassTarget: 'http://www.example.net'
# ProxyPassReverseSource: '/'
# ProxyPassReverseTarget: 'http://www.example.net'
# ProxyRoute:
# my sample route:
# ProxyPassSource: '/'
# ProxyPassTarget: 'http://www.example.net'
# ProxyPassReverseSource: '/'
# ProxyPassReverseTarget: 'http://www.example.net'
Formula_Append: |
Additional config as a