diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-07-14 14:25:20 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-07-14 14:25:20 -0300 |
| commit | 4eb8dfd32499625ceb60d06f3ebf236de727a3b0 (patch) | |
| tree | a778b08eb49a61e4042e26bae34357bfa21974a1 /manifests | |
| parent | d0be0289352ee5f5b44ccfa3d49897ac83c8f3b0 (diff) | |
| download | puppet-nodo-4eb8dfd32499625ceb60d06f3ebf236de727a3b0.tar.gz puppet-nodo-4eb8dfd32499625ceb60d06f3ebf236de727a3b0.tar.bz2 | |
Switching to site-module convention and adding fallback sources
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/subsystems/websites.pp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/manifests/subsystems/websites.pp b/manifests/subsystems/websites.pp index 9facbbf..1ca0ecb 100644 --- a/manifests/subsystems/websites.pp +++ b/manifests/subsystems/websites.pp @@ -36,7 +36,8 @@ class websites::setup { # This mode will also apply to files from the source directory mode => 0644, # Puppet will automatically set +x for directories - source => "puppet://$server/files/apache/htdocs/images", + source => [ "puppet:///modules/site-apache/htdocs/images", + "puppet:///modules/nodo/htdocs/images", ] } # Web index @@ -45,7 +46,8 @@ class websites::setup { owner => "root", group => "root", mode => 0644, - source => "puppet://$server/files/apache/htdocs/index.html", + source => [ "puppet:///modules/site-apache/htdocs/index.html", + "puppet:///modules/nodo/htdocs/index.html", ] } # Missing page @@ -54,7 +56,8 @@ class websites::setup { owner => "root", group => "root", mode => 0644, - source => "puppet://$server/files/apache/htdocs/missing.html", + source => [ "puppet:///modules/site-apache/htdocs/missing.html", + "puppet:///modules/nodo/htdocs/missing.html", ] } # Default vhost: can just be applied on the defining host |