diff options
| author | drebs <drebs@riseup.net> | 2015-06-05 15:43:18 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-07-31 17:16:40 -0300 |
| commit | 04554ac02a16ae3a00407667f11228f057e8d316 (patch) | |
| tree | 59af182d60ff172f9fc781d2bbf1c2b6925ef6f8 | |
| parent | 3f4eccfd5a47f31054f7b1bf82c1c4e1110d6c49 (diff) | |
| download | puppet-apache-04554ac02a16ae3a00407667f11228f057e8d316.tar.gz puppet-apache-04554ac02a16ae3a00407667f11228f057e8d316.tar.bz2 | |
add '.conf' in site conf file names
| -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 7877460..231a326 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -117,7 +117,7 @@ define apache::site( case $source { true: { - file { "${apache::sites}-available/$vhost": + file { "${apache::sites}-available/$vhost.conf": ensure => $ensure, source => [ "puppet:///modules/site_apache/vhosts/$domain/$title", "puppet:///modules/site_apache/vhosts/$title" ], @@ -129,7 +129,7 @@ define apache::site( } } false: { - file { "${apache::sites}-available/$vhost": + file { "${apache::sites}-available/$vhost.conf": ensure => $ensure, content => template("$template"), owner => root, @@ -179,19 +179,19 @@ define apache::site( } } exec { "/usr/sbin/a2ensite $vhost": - unless => "/bin/sh -c '[ -L ${apache::sites}-enabled/$vhost ] \ - && [ ${apache::sites}-enabled/$vhost -ef ${apache::sites}-available/$vhost ]'", + unless => "/bin/sh -c '[ -L ${apache::sites}-enabled/$vhost.conf ] \ + && [ ${apache::sites}-enabled/$vhost.conf -ef ${apache::sites}-available/$vhost.conf ]'", notify => Exec["reload-apache2"], } } 'absent': { exec { "/usr/sbin/a2dissite $vhost": - onlyif => "/bin/sh -c '[ -L ${apache::sites}-enabled/$vhost ] \ - && [ ${apache::sites}-enabled/$vhost -ef ${apache::sites}-available/$vhost ]'", + onlyif => "/bin/sh -c '[ -L ${apache::sites}-enabled/$vhost.conf ] \ + && [ ${apache::sites}-enabled/$vhost.conf -ef ${apache::sites}-available/$vhost.conf ]'", notify => Exec["reload-apache2"], } - file { "${apache::sites}-enabled/$vhost": + file { "${apache::sites}-enabled/$vhost.conf": ensure => absent, notify => Exec["reload-apache2"], } |