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

Do not add ServerAlias unless defined

Browse Source
This commit is contained in:
Noel McLoughin 2018-01-30 23:20:25 +00:00
parent 48bab96af6
commit 147aa71551
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

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

2
apache/vhosts/proxy.tmpl
View File

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

2
apache/vhosts/redirect.tmpl
View File

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

2
apache/vhosts/standard.tmpl
View File

@ -6,7 +6,7 @@
'port': site.get('port', '80'), 'port': site.get('port', '80'),
'ServerName': sitename, 'ServerName': sitename,
'ServerAlias': site.get('ServerAlias', 'www.{0}'.format(sitename)), 'ServerAlias': site.get('ServerAlias', ''),
'ServerAdmin': site.get('ServerAdmin', 'webmaster@{0}'.format(sitename)), '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 exclude_listen_directive: True # Do not add a Listen directive in httpd.conf
ServerName: example.com # uses the unique ID above unless specified 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 ServerAdmin: webmaster@example.com