Use name instead of title

diff --git a/manifests/site.pp b/manifests/site.pp
index 727e148c7ff2a3ae0acd644d241170c4b3ab6b99..e9d5afe4dbbb811c519e2860972bc779e494d46d 100644 (file)
--- 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"],
   #}