summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-03-06 13:22:23 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-03-06 13:22:23 -0300
commitca9500baba258e849a9192917283282645705653 (patch)
tree101eb21907215e1c7023e982567cfcdf12fcfb53
parent842a173f99e2fd2d51bff4cfaba51cadd8932ace (diff)
downloadpuppet-apache-ca9500baba258e849a9192917283282645705653.tar.gz
puppet-apache-ca9500baba258e849a9192917283282645705653.tar.bz2
Use name instead of title
-rw-r--r--manifests/site.pp14
1 files changed, 7 insertions, 7 deletions
diff --git a/manifests/site.pp b/manifests/site.pp
index 727e148..e9d5afe 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -34,25 +34,25 @@ define apache::site(
) {
$vhost = $filename ? {
- '' => "$title",
+ '' => "$name",
default => "$filename",
}
$hosting_domain = hiera('apache::site::domain', $::domain)
$user = $mpm_user ? {
- '' => regsubst($title, '\.', '_', 'G'),
+ '' => regsubst($name, '\.', '_', 'G'),
default => $mpm_user,
}
$gid = $mpm_group ? {
- '' => regsubst($title, '\.', '_', 'G'),
+ '' => regsubst($name, '\.', '_', 'G'),
default => $mpm_group,
}
$hidden_enabled = hiera('apache::site::hidden', false)
if $hidden_service == true and $hidden_enabled == true {
- tor::daemon::hidden_service { $title:
+ tor::daemon::hidden_service { $name:
ports => [ "80 127.0.0.1:${apache::http_port}" ],
data_dir => "${tor::daemon::data_dir}/hidden",
require => File["${tor::daemon::data_dir}/hidden"],
@@ -125,8 +125,8 @@ define apache::site(
true: {
file { "${apache::sites}-available/$vhost.conf":
ensure => $ensure,
- source => [ "puppet:///modules/site_apache/vhosts/$domain/$title",
- "puppet:///modules/site_apache/vhosts/$title" ],
+ source => [ "puppet:///modules/site_apache/vhosts/$domain/$name",
+ "puppet:///modules/site_apache/vhosts/$name" ],
owner => root,
group => root,
mode => 0644,
@@ -158,7 +158,7 @@ define apache::site(
# ensure => $status,
# owner => root,
# group => root,
- # require => File["${apache::sites}-available/$title"],
+ # require => File["${apache::sites}-available/$name"],
# notify => Service["apache"],
#}