diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2016-03-06 13:47:32 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2016-03-06 13:47:32 -0300 |
| commit | 27d061e58c4898942656a47889f261b2a23d927a (patch) | |
| tree | 5b473fec17bbf6a644d9cbb046f758e7a9bd97f8 | |
| parent | 43d18a0c0a01591c13495f90ebf8b912eee7f245 (diff) | |
| download | puppet-apache-27d061e58c4898942656a47889f261b2a23d927a.tar.gz puppet-apache-27d061e58c4898942656a47889f261b2a23d927a.tar.bz2 | |
Back to name var
| -rw-r--r-- | manifests/site.pp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/manifests/site.pp b/manifests/site.pp index b018501..5d92a3f 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"], #} |