diff options
| author | mh <mh@immerda.ch> | 2012-05-31 11:38:45 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2012-05-31 11:38:45 +0200 |
| commit | 076909377eaa3aa41936e3acb7e02a9b5b14d493 (patch) | |
| tree | dae4bd4d405ffe1ba75ea1d50763bfbecf9e1a19 /templates | |
| parent | 4ff385d82bc0d300d501bf1fb41df8602c7c95a6 (diff) | |
fix various puppet language things
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/default/default_index.erb | 4 | ||||
| -rw-r--r-- | templates/itk_plus/CentOS/00-listen-ssl.conf.erb | 2 | ||||
| -rw-r--r-- | templates/itk_plus/CentOS/00-listen.conf.erb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/templates/default/default_index.erb b/templates/default/default_index.erb index dbe9954..b35ecd9 100644 --- a/templates/default/default_index.erb +++ b/templates/default/default_index.erb @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> - <title><%= hostname %></title> + <title><%= scope.lookupvar('::hostname') %></title> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> </head> <body> <h1> No page @ this location</h1> <p> - <small><em><%= hostname %></em></small> + <small><em><%= scope.lookupvar('::hostname') %></em></small> </p> </body> </html> diff --git a/templates/itk_plus/CentOS/00-listen-ssl.conf.erb b/templates/itk_plus/CentOS/00-listen-ssl.conf.erb index 1c06433..83f7bee 100644 --- a/templates/itk_plus/CentOS/00-listen-ssl.conf.erb +++ b/templates/itk_plus/CentOS/00-listen-ssl.conf.erb @@ -2,5 +2,5 @@ Listen 127.0.0.1:443 </IfDefine> <IfDefine !HttpdLocal> -Listen <%= ipaddress %>:443 +Listen <%= scope.lookupvar('::ipaddress') %>:443 </IfDefine> diff --git a/templates/itk_plus/CentOS/00-listen.conf.erb b/templates/itk_plus/CentOS/00-listen.conf.erb index 9f2c626..30b2046 100644 --- a/templates/itk_plus/CentOS/00-listen.conf.erb +++ b/templates/itk_plus/CentOS/00-listen.conf.erb @@ -3,6 +3,6 @@ Listen 127.0.0.1:80 PidFile run/httpdlocal.pid </IfDefine> <IfDefine !HttpdLocal> -Listen <%= ipaddress %>:80 +Listen <%= scope.lookupvar('::ipaddress') %>:80 PidFile run/httpd.pid </IfDefine> |