diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2010-02-07 15:24:42 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2010-02-07 15:24:42 -0200 |
| commit | b317e3ac6756034b873a86a3d904535955a8aae6 (patch) | |
| tree | b14854a6a2066a4e41602aeb139c5a6385bd805c | |
| parent | 87df824ee0911a2749b68a194f725f0629b856d8 (diff) | |
| download | puppet-apache-b317e3ac6756034b873a86a3d904535955a8aae6.tar.gz puppet-apache-b317e3ac6756034b873a86a3d904535955a8aae6.tar.bz2 | |
Introducing $apache_server_name
| -rw-r--r-- | manifests/init.pp | 4 | ||||
| -rw-r--r-- | templates/apache2.conf.erb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 8505d7c..f9c3a81 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -92,6 +92,10 @@ class apache { '': { $apache_error_dest = "${apache_error_folder}/index.html" } } + case $apache_server_name { + '': { $apache_server_name = $fqdn } + } + define site($ensure = present, $docroot = false, $redirect = false, $redirect_match = false, $protocol = 'http', $server_alias = false, $use = false, $ticket = false, diff --git a/templates/apache2.conf.erb b/templates/apache2.conf.erb index 9ff6ea5..cc59c6d 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 <%= fqdn %> +ServerName <%= apache_server_name %> # # ServerRoot: The top of the directory tree under which the server's |