diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-19 16:04:58 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-19 16:04:58 -0200 |
| commit | 2c16c4788cc352a79c548fd9164d65264ae55d22 (patch) | |
| tree | 536f777142d2117405a005f44936b6b0d55ab002 /templates/macros.erb | |
| parent | 35690aec253a16ca0c48f4fb249ce940dc5f48e0 (diff) | |
| download | puppet-apache-2c16c4788cc352a79c548fd9164d65264ae55d22.tar.gz puppet-apache-2c16c4788cc352a79c548fd9164d65264ae55d22.tar.bz2 | |
Upgrading for 2.7 compatibility
Diffstat (limited to 'templates/macros.erb')
| -rw-r--r-- | templates/macros.erb | 16 |
1 files changed, 8 insertions, 8 deletions
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 / |