From b1bf78c8af695cc306fe8051eec4dc956f1eb826 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Tue, 3 Nov 2015 16:59:07 -0200 Subject: Fix template deprecations --- templates/apache2.conf.trusty.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'templates/apache2.conf.trusty.erb') diff --git a/templates/apache2.conf.trusty.erb b/templates/apache2.conf.trusty.erb index 0fc143b..b68f822 100644 --- a/templates/apache2.conf.trusty.erb +++ b/templates/apache2.conf.trusty.erb @@ -35,7 +35,7 @@ # such as the number of concurrent requests it can handle or where it # can find its configuration files. # -ServerName <%= scope.lookupvar('apache::server_name') %>.<%= domain %> +ServerName <%= scope.lookupvar('apache::server_name') %>.<%= @domain %> # # ServerRoot: The top of the directory tree under which the server's @@ -123,8 +123,8 @@ KeepAliveTimeout 15 MaxRequestsPerChild 0 -User <%= default_user %> -Group <%= default_group %> +User <%= @default_user %> +Group <%= @default_group %> # # AccessFileName: The name of the file to look for in each directory @@ -455,7 +455,7 @@ ServerSignature Off #ErrorDocument 404 "/cgi-bin/missing_handler.pl" #ErrorDocument 402 http://www.example.com/subscription_info.html # -ErrorDocument 404 http://<%= domain %>/missing.html +ErrorDocument 404 http://<%= @domain %>/missing.html # # Putting this all together, we can internationalize error responses. -- cgit v1.2.3