diff options
| author | Thomas Backlund <tmb@mageia.org> | 2016-02-08 01:39:18 +0200 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2016-02-08 01:39:18 +0200 |
| commit | caa691d2e81851307fe0d1283f31cc3029fcb403 (patch) | |
| tree | 8abf5de16b8d4958e4861c6493eb6b2d1ea9ee41 /deployment/websites | |
| parent | 9cd1ce85970b370390ab99aa385ccd0bdf85b03a (diff) | |
| download | puppet-caa691d2e81851307fe0d1283f31cc3029fcb403.tar puppet-caa691d2e81851307fe0d1283f31cc3029fcb403.tar.gz puppet-caa691d2e81851307fe0d1283f31cc3029fcb403.tar.bz2 puppet-caa691d2e81851307fe0d1283f31cc3029fcb403.tar.xz puppet-caa691d2e81851307fe0d1283f31cc3029fcb403.zip | |
fix up vhostdir variable lookup
Diffstat (limited to 'deployment/websites')
| -rw-r--r-- | deployment/websites/templates/vhost_static.conf | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/deployment/websites/templates/vhost_static.conf b/deployment/websites/templates/vhost_static.conf index 2d3f4c44..d250a712 100644 --- a/deployment/websites/templates/vhost_static.conf +++ b/deployment/websites/templates/vhost_static.conf @@ -1,7 +1,7 @@ <VirtualHost *:80> ServerName static.<%= domain %> - DocumentRoot <%= vhostdir %> + DocumentRoot <%= scope.lookupvar("websites::static::vhostdir") %> CustomLog /var/log/httpd/static_log combined ErrorLog /var/log/httpd/error_static_log @@ -26,13 +26,13 @@ Allow from all </Location> - <Directory <%= vhostdir %>> + <Directory <%= scope.lookupvar("websites::static::vhostdir") %>> Order deny,allow Deny from All AllowOverride None </Directory> - <Directory <%= vhostdir %>/g> + <Directory <%= scope.lookupvar("websites::static::vhostdir") %>/g> Order deny,allow Allow from All AllowOverride None @@ -42,7 +42,7 @@ <VirtualHost *:443> ServerName static.<%= domain %> - DocumentRoot <%= vhostdir %> + DocumentRoot <%= scope.lookupvar("websites::static::vhostdir") %> CustomLog /var/log/httpd/static_log combined ErrorLog /var/log/httpd/error_static_log @@ -69,13 +69,13 @@ Allow from all </Location> - <Directory <%= vhostdir %>> + <Directory <%= scope.lookupvar("websites::static::vhostdir") %>> Order deny,allow Deny from All AllowOverride None </Directory> - <Directory <%= vhostdir %>/g> + <Directory <%= scope.lookupvar("websites::static::vhostdir") %>/g> Order deny,allow Allow from All AllowOverride None |