saltstack-formulas/apache-formula
1
0
Fork 0
mirror of https://github.com/saltstack-formulas/apache-formula.git synced 2025-04-17 10:10:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #220 from noelmcloughlin/issue122

Browse source 
Do not add ServerAlias unless defined
This commit is contained in:
N 2018-03-15 10:46:55 +00:00 • committed by GitHub
commit 7e66b260e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apache/vhosts/minimal.tmpl
View file

@ -9,7 +9,7 @@
'port': site.get('port', '80'),
'ServerName': sitename,
'ServerAlias': site.get('ServerAlias', 'www.{0}'.format(sitename)),
'ServerAlias': site.get('ServerAlias', ''),
'ServerAdmin': site.get('ServerAdmin', 'webmaster@{0}'.format(sitename)),

2
apache/vhosts/proxy.tmpl
View file

@ -9,7 +9,7 @@
'port': site.get('port', '80'),
'ServerName': sitename,
'ServerAlias': site.get('ServerAlias', 'www.{0}'.format(sitename)),
'ServerAlias': site.get('ServerAlias', ''),
'ServerAdmin': site.get('ServerAdmin', 'webmaster@{0}'.format(sitename)),

2
apache/vhosts/redirect.tmpl
View file

@ -10,7 +10,7 @@
'port': site.get('port', '80'),
'ServerName': sitename,
'ServerAlias': site.get('ServerAlias', 'www.{0}'.format(sitename)),
'ServerAlias': site.get('ServerAlias', ''),
'ServerAdmin': site.get('ServerAdmin', 'webmaster@{0}'.format(sitename)),

2
apache/vhosts/standard.tmpl
View file

@ -9,7 +9,7 @@
'port': site.get('port', '80'),
'ServerName': sitename,
'ServerAlias': site.get('ServerAlias', 'www.{0}'.format(sitename)),
'ServerAlias': site.get('ServerAlias', ''),
'ServerAdmin': site.get('ServerAdmin', 'webmaster@{0}'.format(sitename)),

2
pillar.example
View file

@ -62,7 +62,7 @@ apache:
exclude_listen_directive: True # Do not add a Listen directive in httpd.conf
ServerName: example.com # uses the unique ID above unless specified
ServerAlias: www.example.com
#ServerAlias: www.example.com # Do not add ServerAlias unless defined
ServerAdmin: webmaster@example.com