Noel McLoughin
7 years ago
5 changed files with 5 additions and 5 deletions
+ 1
- 1
apache/vhosts/minimal.tmpl
View File
| @@ -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
View File
| @@ -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
View File
| @@ -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
View File
| @@ -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
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 | |||
Loading…