Explorar el Código

Do not add ServerAlias unless defined

tags/v0.37.4
Noel McLoughin hace 7 años
padre
commit
147aa71551
Se han modificado 5 ficheros con 5 adiciones y 5 borrados
  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 Ver fichero

@@ -6,7 +6,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)),


+ 1
- 1
apache/vhosts/proxy.tmpl Ver fichero

@@ -6,7 +6,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)),


+ 1
- 1
apache/vhosts/redirect.tmpl Ver fichero

@@ -7,7 +7,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)),


+ 1
- 1
apache/vhosts/standard.tmpl Ver fichero

@@ -6,7 +6,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)),


+ 1
- 1
pillar.example Ver fichero

@@ -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


Cargando…
Cancelar
Guardar