Upgrading for 2.7 compatibility

5 files changed, 16 insertions, 16 deletions

diff --git a/templates/alias.conf.erb b/templates/alias.conf.erb
index 4e96ad1..cd74c66 100644
--- a/templates/alias.conf.erb
+++ b/templates/alias.conf.erb
@@ -12,9 +12,9 @@
 # We include the /icons/ alias for FancyIndexed directory listings.  If
 # you do not use FancyIndexing, you may comment this out.
 #
-Alias /icons "<%= apache_www_folder %>/icons"
+Alias /icons "<%= scope.lookupvar('apache::www_folder') %>/icons"
 
-<Directory "<%= apache_www_folder %>/icons">
+<Directory "<%= scope.lookupvar('apache::www_folder') %>/icons">
     Options Indexes MultiViews
     AllowOverride None
     Order allow,deny
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
diff --git a/templates/default.erb b/templates/default.erb
index b7175b0..a4361b7 100644
--- a/templates/default.erb
+++ b/templates/default.erb
@@ -1,10 +1,10 @@
 # begin vhost for <%= fqdn %>
 <VirtualHost *:80>
    ServerName <%= fqdn %>
-   DocumentRoot <%= apache_default_folder %>
+   DocumentRoot <%= scope.lookupvar('apache::default_folder') %>
       
    # begin site config
-   <Directory <%= apache_default_folder %>>
+   <Directory <%= scope.lookupvar('apache::default_folder') %>>
       Options Indexes Includes FollowSymLinks MultiViews
       AllowOverride All
    </Directory>
diff --git a/templates/error.erb b/templates/error.erb
index e0dbb0e..70693fe 100644
--- a/templates/error.erb
+++ b/templates/error.erb
@@ -2,10 +2,10 @@
 <VirtualHost *:80>
   ServerName error.<%= hosting_domain %>
   ServerAlias *.<%= hosting_domain %>
-  DocumentRoot <%= apache_error_folder %>
-  ErrorDocument 404 <%= apache_error_dest %>
+  DocumentRoot <%= scope.lookupvar('apache::error_folder') %>
+  ErrorDocument 404 <%= scope.lookupvar('apache::error_dest') %>
 
-  <Directory <%= apache_error_folder %>>
+  <Directory <%= scope.lookupvar('apache::error_folder') %>>
     DirectoryIndex index.html
     Options Indexes -Includes FollowSymLinks -MultiViews
     AllowOverride None
diff --git a/templates/macros.erb b/templates/macros.erb
index 2f7941f..1cabce5 100644
--- a/templates/macros.erb
+++ b/templates/macros.erb
@@ -21,7 +21,7 @@
 
 <Macro Drupal $version>
    # begin drupal config
-   <Directory <%= apache_www_folder %>/drupal-$version>
+   <Directory <%= scope.lookupvar('apache::www_folder') %>/drupal-$version>
       Options Indexes Includes FollowSymLinks MultiViews
       AllowOverride All
    </Directory>
@@ -30,7 +30,7 @@
 
 <Macro Wiki $site>
    # begin wiki config
-   <Directory <%= apache_sites_folder %>/$site/wiki>
+   <Directory <%= scope.lookupvar('apache::sites_folder') %>/$site/wiki>
       Options Indexes Includes FollowSymLinks MultiViews
       AllowOverride All
    </Directory>
@@ -39,7 +39,7 @@
 
 <Macro Site $name>
    # begin site config
-   <Directory <%= apache_sites_folder %>/$name/site>
+   <Directory <%= scope.lookupvar('apache::sites_folder') %>/$name/site>
       Options Indexes Includes FollowSymLinks MultiViews
       AllowOverride All
    </Directory>
@@ -52,7 +52,7 @@
      SetHandler mod_python
      PythonInterpreter main_interpreter
      PythonHandler trac.web.modpython_frontend
-     PythonOption TracEnv <%= apache_sites_folder %>/$site/trac
+     PythonOption TracEnv <%= scope.lookupvar('apache::sites_folder') %>/$site/trac
      PythonOption TracUriRoot /trac
 
      # This prevents strange behavior when using trac
@@ -64,7 +64,7 @@
    <Location "/trac/login">
      AuthType Basic
      AuthName "Trac $site"
-     AuthUserFile <%= apache_sites_folder %>/$site/trac/auth/.htpasswd
+     AuthUserFile <%= scope.lookupvar('apache::sites_folder') %>/$site/trac/auth/.htpasswd
      Require valid-user
    </Location>
    # end trac config
@@ -75,13 +75,13 @@
    Alias /moinroot /usr/share/moin/htdocs/
    AliasMatch ^/moin_static[0-9]*/(.*)$ /usr/share/moin/htdocs/$1
    # TODO: fastcgi
-   ScriptAlias /moin "<%= apache_sites_folder %>/$site/moin/cgi-bin/moin.cgi"
+   ScriptAlias /moin "<%= scope.lookupvar('apache::sites_folder') %>/$site/moin/cgi-bin/moin.cgi"
    # end moin config
 </Macro>
 
 <Macro Ikiwiki $name>
    # begin ikiwiki config
-   <Directory <%= apache_sites_folder %>/$name/ikiwiki>
+   <Directory <%= scope.lookupvar('apache::sites_folder') %>/$name/ikiwiki>
       Options Indexes Includes FollowSymLinks MultiViews ExecCGI
       AllowOverride All
    </Directory>
@@ -92,7 +92,7 @@
    # begin rails config
    PassengerUploadBufferDir /tmp
 
-   <Directory <%= apache_sites_folder %>/$name/site>
+   <Directory <%= scope.lookupvar('apache::sites_folder') %>/$name/site>
       Options -MultiViews
       AllowOverride All
       RailsBaseURI /