diff options
| author | Thomas Backlund <tmb@mageia.org> | 2015-10-20 19:17:17 +0300 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2015-10-20 19:17:17 +0300 |
| commit | 27a18326e816aeb9ab98d9fbaef33f8bd6a2a5d2 (patch) | |
| tree | 066647fa051720fac7a2e21a2a8d9759f42b3d46 /deployment/websites/manifests/www.pp | |
| parent | c61daf65b58b943994d1f21e52deee9a9ce04827 (diff) | |
| download | puppet-27a18326e816aeb9ab98d9fbaef33f8bd6a2a5d2.tar puppet-27a18326e816aeb9ab98d9fbaef33f8bd6a2a5d2.tar.gz puppet-27a18326e816aeb9ab98d9fbaef33f8bd6a2a5d2.tar.bz2 puppet-27a18326e816aeb9ab98d9fbaef33f8bd6a2a5d2.tar.xz puppet-27a18326e816aeb9ab98d9fbaef33f8bd6a2a5d2.zip | |
variable enclosing fixes
Diffstat (limited to 'deployment/websites/manifests/www.pp')
| -rw-r--r-- | deployment/websites/manifests/www.pp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/deployment/websites/manifests/www.pp b/deployment/websites/manifests/www.pp index 6a3d9963..8d5443d8 100644 --- a/deployment/websites/manifests/www.pp +++ b/deployment/websites/manifests/www.pp @@ -1,7 +1,7 @@ class websites::www { include websites::base $vhost = "www.${::domain}" - $vhostdir = "$websites::base::webdatadir/${vhost}" + $vhostdir = "${websites::base::webdatadir}/${vhost}" $git_location = "git://git.${::domain}/web/www" include apache::var @@ -45,13 +45,13 @@ class websites::www { options => ['FollowSymLinks'], } - apache::vhost_redirect { ${::domain}: + apache::vhost_redirect { "${::domain}": url => "http://www.${::domain}/", } apache::vhost_redirect { "ssl_${::domain}": use_ssl => true, - vhost => ${::domain}, + vhost => "${::domain}", url => "https://www.${::domain}/", } |