diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-11-29 23:27:33 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-11-29 23:27:33 -0200 |
| commit | c7b4ac8d74d27c385dc34986131239a0df3c66a7 (patch) | |
| tree | 96fadf953423b36b62fce035eef042ccb47ee104 | |
| parent | 1830ea97e9c41daf2a738d2aa2d10ee1b76e8cd3 (diff) | |
| download | puppet-nodo-c7b4ac8d74d27c385dc34986131239a0df3c66a7.tar.gz puppet-nodo-c7b4ac8d74d27c385dc34986131239a0df3c66a7.tar.bz2 | |
No need for virtual website resources; overriding is enough
| -rw-r--r-- | manifests/subsystems/websites.pp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/manifests/subsystems/websites.pp b/manifests/subsystems/websites.pp index a71506d..60944a9 100644 --- a/manifests/subsystems/websites.pp +++ b/manifests/subsystems/websites.pp @@ -144,27 +144,26 @@ class websites::hosting inherits websites::setup { include pmwiki include apache::rails - Apache::Site <| tag == $hostname or tag == 'all' |> - Database::Instance <| tag == $hostname or tag == 'all' |> - Ikiwiki::Instance <| tag == $hostname or tag == 'all' |> + apache::site { "images": + docroot => "${apache_www_folder}/images", + mpm => false, + tag => 'all', + } + # Remove untagged site instances Apache::Site <| tag != $hostname and tag != 'all' |> { ensure => absent, } + # Remove untagged database instances Database::Instance <| tag != $hostname and tag != 'all' |> { ensure => absent, } + # Remove untagged ikiwiki instances Ikiwiki::Instance <| tag != $hostname and tag != 'all' |> { ensure => absent, } - - @apache::site { "images": - docroot => "${apache_www_folder}/images", - mpm => false, - tag => 'all', - } } class websites::hosting::admin inherits websites::setup { |