diff options
| -rw-r--r-- | manifests/init.pp | 2 | ||||
| -rw-r--r-- | templates/apache2.conf.erb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 5ad7b16..f21a02d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -47,7 +47,7 @@ class apache { } case $apache_server_name { - '': { $apache_server_name = $fqdn } + '': { $apache_server_name = $hostname } } package { "apache": diff --git a/templates/apache2.conf.erb b/templates/apache2.conf.erb index cc59c6d..ee28bdc 100644 --- a/templates/apache2.conf.erb +++ b/templates/apache2.conf.erb @@ -35,7 +35,7 @@ # such as the number of concurrent requests it can handle or where it # can find its configuration files. # -ServerName <%= apache_server_name %> +ServerName <%= apache_server_name %>.<%= domain %> # # ServerRoot: The top of the directory tree under which the server's |