diff options
| author | Thomas Backlund <tmb@mageia.org> | 2015-10-20 17:51:42 +0300 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2015-10-20 17:51:42 +0300 |
| commit | c61daf65b58b943994d1f21e52deee9a9ce04827 (patch) | |
| tree | ffeb83234cb01580abe04217f8b8eca9698d5424 /deployment/websites/manifests/www.pp | |
| parent | c4cb8478752701a83c4e3b4b73d661e188d67daa (diff) | |
| download | puppet-c61daf65b58b943994d1f21e52deee9a9ce04827.tar puppet-c61daf65b58b943994d1f21e52deee9a9ce04827.tar.gz puppet-c61daf65b58b943994d1f21e52deee9a9ce04827.tar.bz2 puppet-c61daf65b58b943994d1f21e52deee9a9ce04827.tar.xz puppet-c61daf65b58b943994d1f21e52deee9a9ce04827.zip | |
use consistent domain references
Diffstat (limited to 'deployment/websites/manifests/www.pp')
| -rw-r--r-- | deployment/websites/manifests/www.pp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/deployment/websites/manifests/www.pp b/deployment/websites/manifests/www.pp index 0a84f7e9..6a3d9963 100644 --- a/deployment/websites/manifests/www.pp +++ b/deployment/websites/manifests/www.pp @@ -1,8 +1,8 @@ class websites::www { include websites::base - $vhost = "www.$::domain" + $vhost = "www.${::domain}" $vhostdir = "$websites::base::webdatadir/${vhost}" - $git_location = "git://git.$::domain/web/www" + $git_location = "git://git.${::domain}/web/www" include apache::var include apache::mod::php @@ -45,14 +45,14 @@ class websites::www { options => ['FollowSymLinks'], } - apache::vhost_redirect { $::domain: - url => "http://www.$::domain/", + apache::vhost_redirect { ${::domain}: + url => "http://www.${::domain}/", } - apache::vhost_redirect { "ssl_$::domain": + apache::vhost_redirect { "ssl_${::domain}": use_ssl => true, - vhost => $::domain, - url => "https://www.$::domain/", + vhost => ${::domain}, + url => "https://www.${::domain}/", } package { ['php-mbstring', 'php-mcrypt', 'php-gettext', 'php-geoip']: } |