Quellcode durchsuchen
Merge pull request #220 from noelmcloughlin/issue122
Do not add ServerAlias unless definedmaster
N
vor 6 Jahren
5 geänderte Dateien mit 5 neuen und 5 gelöschten Zeilen
+ 1
- 1
apache/vhosts/minimal.tmpl
Datei anzeigen
| @@ -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)), | |||
+ 1
- 1
apache/vhosts/proxy.tmpl
Datei anzeigen
| @@ -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)), | |||
+ 1
- 1
apache/vhosts/redirect.tmpl
Datei anzeigen
| @@ -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)), | |||
+ 1
- 1
apache/vhosts/standard.tmpl
Datei anzeigen
| @@ -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)), | |||
+ 1
- 1
pillar.example
Datei anzeigen
| @@ -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 | |||
Laden…