diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-19 16:04:58 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-19 16:04:58 -0200 |
| commit | 2c16c4788cc352a79c548fd9164d65264ae55d22 (patch) | |
| tree | 536f777142d2117405a005f44936b6b0d55ab002 /manifests/site.pp | |
| parent | 35690aec253a16ca0c48f4fb249ce940dc5f48e0 (diff) | |
| download | puppet-apache-2c16c4788cc352a79c548fd9164d65264ae55d22.tar.gz puppet-apache-2c16c4788cc352a79c548fd9164d65264ae55d22.tar.bz2 | |
Upgrading for 2.7 compatibility
Diffstat (limited to 'manifests/site.pp')
| -rw-r--r-- | manifests/site.pp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/manifests/site.pp b/manifests/site.pp index 0c68361..d5046da 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -109,25 +109,25 @@ define apache::site($ensure = present, $docroot = false, $redirect = false, case $source { true: { - file { "${apache2_sites}-available/$vhost": + file { "${apache::sites}-available/$vhost": ensure => $ensure, source => [ "puppet:///modules/site-apache/vhosts/$domain/$title", "puppet:///modules/site-apache/vhosts/$title" ], owner => root, group => root, mode => 0644, - require => File["${apache2_macros}"], + require => File["${apache::macros}"], notify => Service["apache"], } } false: { - file { "${apache2_sites}-available/$vhost": + file { "${apache::sites}-available/$vhost": ensure => $ensure, content => template("$template"), owner => root, group => root, mode => 0644, - require => File["${apache2_macros}"], + require => File["${apache::macros}"], notify => Service["apache"], } } @@ -136,7 +136,7 @@ define apache::site($ensure = present, $docroot = false, $redirect = false, # Enable the site without a2ensite # #$status = $ensure ? { - # 'present' => "${apache2_sites}-available/$vhost", + # 'present' => "${apache::sites}-available/$vhost", # default => 'absent', #} # @@ -144,7 +144,7 @@ define apache::site($ensure = present, $docroot = false, $redirect = false, # ensure => $status, # owner => root, # group => root, - # require => File["${apache2_sites}-available/$title"], + # require => File["${apache::sites}-available/$title"], # notify => Service["apache"], #} @@ -171,19 +171,19 @@ define apache::site($ensure = present, $docroot = false, $redirect = false, } } exec { "/usr/sbin/a2ensite $vhost": - unless => "/bin/sh -c '[ -L ${apache2_sites}-enabled/$vhost ] \ - && [ ${apache2_sites}-enabled/$vhost -ef ${apache2_sites}-available/$vhost ]'", + unless => "/bin/sh -c '[ -L ${apache::sites}-enabled/$vhost ] \ + && [ ${apache::sites}-enabled/$vhost -ef ${apache::sites}-available/$vhost ]'", notify => Exec["reload-apache2"], } } 'absent': { exec { "/usr/sbin/a2dissite $vhost": - onlyif => "/bin/sh -c '[ -L ${apache2_sites}-enabled/$vhost ] \ - && [ ${apache2_sites}-enabled/$vhost -ef ${apache2_sites}-available/$vhost ]'", + onlyif => "/bin/sh -c '[ -L ${apache::sites}-enabled/$vhost ] \ + && [ ${apache::sites}-enabled/$vhost -ef ${apache::sites}-available/$vhost ]'", notify => Exec["reload-apache2"], } - file { "${apache2_sites}-enabled/$vhost": + file { "${apache::sites}-enabled/$vhost": ensure => absent, notify => Exec["reload-apache2"], } |