diff --git a/apache/templates/apache2.httpd.conf.erb b/apache/templates/apache2.httpd.conf.erb index 4050592..1f1aaa9 100644 --- a/apache/templates/apache2.httpd.conf.erb +++ b/apache/templates/apache2.httpd.conf.erb @@ -1,9 +1,11 @@ +<% if has_variable?("domain") -%> # # ServerAdmin: Your address, where problems with the server should be # e-mailed. This address appears on some server-generated pages, such # as error documents. e.g. admin@your-domain.com # ServerAdmin adm@<%= domain %> +<% end -%> # # ServerName gives the name and port that the server uses to identify itself. diff --git a/apache/templates/httpd.conf.erb b/apache/templates/httpd.conf.erb index 684056a..64f59cc 100644 --- a/apache/templates/httpd.conf.erb +++ b/apache/templates/httpd.conf.erb @@ -245,12 +245,14 @@ Group <%= httpd_group %> # virtual host being defined. # +<% if has_variable?("domain") -%> # # ServerAdmin: Your address, where problems with the server should be # e-mailed. This address appears on some server-generated pages, such # as error documents. e.g. admin@your-domain.com # ServerAdmin adm@<%= domain %> +<% end -%> # # ServerName gives the name and port that the server uses to identify itself. diff --git a/apache/templates/httpsd.conf.erb b/apache/templates/httpsd.conf.erb index 3df318c..feedaeb 100644 --- a/apache/templates/httpsd.conf.erb +++ b/apache/templates/httpsd.conf.erb @@ -245,12 +245,14 @@ Group <%= httpsd_group %> # virtual host being defined. # +<% if has_variable?("domain") -%> # # ServerAdmin: Your address, where problems with the server should be # e-mailed. This address appears on some server-generated pages, such # as error documents. e.g. admin@your-domain.com # ServerAdmin adm@<%= domain %> +<% end -%> # # ServerName gives the name and port that the server uses to identify itself.