diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-11-03 16:59:07 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-11-03 16:59:07 -0200 |
| commit | b1bf78c8af695cc306fe8051eec4dc956f1eb826 (patch) | |
| tree | 123abc7e8346317efcc5913b7af0859045df722c /templates/apache2.conf.trusty.erb | |
| parent | c5f141db8cd3961ba2d62763dd1d0975ed8f6956 (diff) | |
| download | puppet-apache-b1bf78c8af695cc306fe8051eec4dc956f1eb826.tar.gz puppet-apache-b1bf78c8af695cc306fe8051eec4dc956f1eb826.tar.bz2 | |
Fix template deprecations
Diffstat (limited to 'templates/apache2.conf.trusty.erb')
| -rw-r--r-- | templates/apache2.conf.trusty.erb | 8 |
1 files changed, 4 insertions, 4 deletions
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 </IfModule> -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. |