Browse Source

Do not add ServerAlias unless defined

tags/v0.37.4
Noel McLoughin 7 years ago
parent
commit
147aa71551
5 changed files with 5 additions and 5 deletions
  1. +1
    -1
      apache/vhosts/minimal.tmpl
  2. +1
    -1
      apache/vhosts/proxy.tmpl
  3. +1
    -1
      apache/vhosts/redirect.tmpl
  4. +1
    -1
      apache/vhosts/standard.tmpl
  5. +1
    -1
      pillar.example

+ 1
- 1
apache/vhosts/minimal.tmpl View File

'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)),



+ 1
- 1
apache/vhosts/proxy.tmpl View File

'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)),



+ 1
- 1
apache/vhosts/redirect.tmpl View File

'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)),



+ 1
- 1
apache/vhosts/standard.tmpl View File

'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)),



+ 1
- 1
pillar.example View File

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



Loading…
Cancel
Save