diff options
Diffstat (limited to 'deployment/websites/manifests')
-rw-r--r-- | deployment/websites/manifests/archives.pp | 4 | ||||
-rw-r--r-- | deployment/websites/manifests/doc.pp | 4 | ||||
-rw-r--r-- | deployment/websites/manifests/forum_proxy.pp | 2 | ||||
-rw-r--r-- | deployment/websites/manifests/git.pp | 4 | ||||
-rw-r--r-- | deployment/websites/manifests/hugs.pp | 6 | ||||
-rw-r--r-- | deployment/websites/manifests/nav.pp | 4 | ||||
-rw-r--r-- | deployment/websites/manifests/perl.pp | 2 | ||||
-rw-r--r-- | deployment/websites/manifests/releases.pp | 4 | ||||
-rw-r--r-- | deployment/websites/manifests/start.pp | 4 | ||||
-rw-r--r-- | deployment/websites/manifests/static.pp | 6 | ||||
-rw-r--r-- | deployment/websites/manifests/svn.pp | 4 | ||||
-rw-r--r-- | deployment/websites/manifests/www.pp | 14 |
12 files changed, 29 insertions, 29 deletions
diff --git a/deployment/websites/manifests/archives.pp b/deployment/websites/manifests/archives.pp index 9180813b..ea66f3b8 100644 --- a/deployment/websites/manifests/archives.pp +++ b/deployment/websites/manifests/archives.pp @@ -1,8 +1,8 @@ class websites::archives { include websites::base - $vhost = "archives.$::domain" + $vhost = "archives.${::domain}" $vhostdir = "$websites::base::webdatadir/${vhost}" - $git_location = "git://git.$::domain/web/archives" + $git_location = "git://git.${::domain}/web/archives" apache::vhost::base { $vhost: location => $vhostdir, diff --git a/deployment/websites/manifests/doc.pp b/deployment/websites/manifests/doc.pp index 69b2a3a4..46e1230d 100644 --- a/deployment/websites/manifests/doc.pp +++ b/deployment/websites/manifests/doc.pp @@ -1,8 +1,8 @@ class websites::doc { include websites::base - $vhost = "doc.$::domain" + $vhost = "doc.${::domain}" $vhostdir = "$websites::base::webdatadir/${vhost}" - $git_location = "git://git.$::domain/web/doc" + $git_location = "git://git.${::domain}/web/doc" apache::vhost::base { $vhost: location => $vhostdir, diff --git a/deployment/websites/manifests/forum_proxy.pp b/deployment/websites/manifests/forum_proxy.pp index 1cb6c034..bd8f1fc1 100644 --- a/deployment/websites/manifests/forum_proxy.pp +++ b/deployment/websites/manifests/forum_proxy.pp @@ -1,5 +1,5 @@ class websites::forum_proxy { - $web_domain = "forums.$::domain" + $web_domain = "forums.${::domain}" apache::vhost::reverse_proxy { $web_domain: url => "http://${web_domain}/", diff --git a/deployment/websites/manifests/git.pp b/deployment/websites/manifests/git.pp index 070c13a5..8e7a0058 100644 --- a/deployment/websites/manifests/git.pp +++ b/deployment/websites/manifests/git.pp @@ -1,5 +1,5 @@ class websites::git { - apache::vhost_redirect { "git.$::domain": - url => "http://gitweb.$::domain/", + apache::vhost_redirect { "git.${::domain}": + url => "http://gitweb.${::domain}/", } } diff --git a/deployment/websites/manifests/hugs.pp b/deployment/websites/manifests/hugs.pp index 2840b45a..27a554a7 100644 --- a/deployment/websites/manifests/hugs.pp +++ b/deployment/websites/manifests/hugs.pp @@ -1,10 +1,10 @@ class websites::hugs { include websites::base - $vhostdir = "$websites::base::webdatadir/hugs.$::domain" - $git_location = "git://git.$::domain/web/hugs" + $vhostdir = "$websites::base::webdatadir/hugs.${::domain}" + $git_location = "git://git.${::domain}/web/hugs" - apache::vhost::base { "hugs.$::domain": + apache::vhost::base { "hugs.${::domain}": location => $vhostdir, } diff --git a/deployment/websites/manifests/nav.pp b/deployment/websites/manifests/nav.pp index d0a6e295..4e3f0330 100644 --- a/deployment/websites/manifests/nav.pp +++ b/deployment/websites/manifests/nav.pp @@ -1,8 +1,8 @@ class websites::nav { include websites::base - $vhost = "nav.$::domain" + $vhost = "nav.${::domain}" $vhostdir = "$websites::base::webdatadir/${vhost}" - $git_location = "git://git.$::domain/web/nav" + $git_location = "git://git.${::domain}/web/nav" apache::vhost::base { $vhost: location => $vhostdir, diff --git a/deployment/websites/manifests/perl.pp b/deployment/websites/manifests/perl.pp index ec48c5a3..13bafb15 100644 --- a/deployment/websites/manifests/perl.pp +++ b/deployment/websites/manifests/perl.pp @@ -1,6 +1,6 @@ class websites::perl { include websites::base - $vhost = "perl.$::domain" + $vhost = "perl.${::domain}" $vhostdir = "$websites::base::webdatadir/${vhost}" $statsdir = "${vhostdir}/stats" $login = 'pkgcpan' diff --git a/deployment/websites/manifests/releases.pp b/deployment/websites/manifests/releases.pp index afb923c8..91ad968b 100644 --- a/deployment/websites/manifests/releases.pp +++ b/deployment/websites/manifests/releases.pp @@ -1,8 +1,8 @@ class websites::releases { include websites::base - $vhost = "releases.$::domain" + $vhost = "releases.${::domain}" $vhostdir = "$websites::base::webdatadir/${vhost}" - $git_location = "git://git.$::domain/web/releases" + $git_location = "git://git.${::domain}/web/releases" apache::vhost::base { $vhost: location => $vhostdir, diff --git a/deployment/websites/manifests/start.pp b/deployment/websites/manifests/start.pp index d73b4f9c..ed0d4adb 100644 --- a/deployment/websites/manifests/start.pp +++ b/deployment/websites/manifests/start.pp @@ -1,6 +1,6 @@ class websites::start { include websites::base - apache::vhost_redirect { "start.$::domain": - url => "http://www.$::domain/community/", + apache::vhost_redirect { "start.${::domain}": + url => "http://www.${::domain}/community/", } } diff --git a/deployment/websites/manifests/static.pp b/deployment/websites/manifests/static.pp index f2efa792..55a7e596 100644 --- a/deployment/websites/manifests/static.pp +++ b/deployment/websites/manifests/static.pp @@ -1,8 +1,8 @@ class websites::static { include websites::base - $vhostdir = "$websites::base::webdatadir/static.$::domain" + $vhostdir = "$websites::base::webdatadir/static.${::domain}" - apache::vhost::other_app { "static.$::domain": + apache::vhost::other_app { "static.${::domain}": vhost_file => 'websites/vhost_static.conf', } @@ -11,6 +11,6 @@ class websites::static { } git::snapshot { "${vhostdir}": - source => "git://git.$::domain/web/www", + source => "git://git.${::domain}/web/www", } } diff --git a/deployment/websites/manifests/svn.pp b/deployment/websites/manifests/svn.pp index 650442dc..d8e87f64 100644 --- a/deployment/websites/manifests/svn.pp +++ b/deployment/websites/manifests/svn.pp @@ -1,5 +1,5 @@ class websites::svn { - apache::vhost_redirect { "svn.$::domain": - url => "http://svnweb.$::domain/", + apache::vhost_redirect { "svn.${::domain}": + url => "http://svnweb.${::domain}/", } } 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']: } |