summaryrefslogtreecommitdiff
path: root/templates/apache2.conf.erb
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-19 16:04:58 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-19 16:04:58 -0200
commit2c16c4788cc352a79c548fd9164d65264ae55d22 (patch)
tree536f777142d2117405a005f44936b6b0d55ab002 /templates/apache2.conf.erb
parent35690aec253a16ca0c48f4fb249ce940dc5f48e0 (diff)
downloadpuppet-apache-2c16c4788cc352a79c548fd9164d65264ae55d22.tar.gz
puppet-apache-2c16c4788cc352a79c548fd9164d65264ae55d22.tar.bz2
Upgrading for 2.7 compatibility
Diffstat (limited to 'templates/apache2.conf.erb')
-rw-r--r--templates/apache2.conf.erb2
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/apache2.conf.erb b/templates/apache2.conf.erb
index 26760b6..60cc2b3 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 %>.<%= domain %>
+ServerName <%= scope.lookupvar('apache::server_name') %>.<%= domain %>
#
# ServerRoot: The top of the directory tree under which the server's