diff options
| author | andreas <andreas@immerda.ch> | 2008-03-08 16:33:11 +0000 |
|---|---|---|
| committer | andreas <andreas@immerda.ch> | 2008-03-08 16:33:11 +0000 |
| commit | 18394fa6e8a3aa88887374dfe61c0444caa77c29 (patch) | |
| tree | 7fa81c2b388ef20f80a525b84a61c7e471870d61 /manifests/init.pp | |
| parent | 656587d4deaa367a06e6c8305b544505820d96ab (diff) | |
korrektur vhosts raufladen (falsche zusammensetzung des file-pfads)
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 6bff0d3..1bcd8d4 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -70,7 +70,7 @@ class apache::centos inherits apache::base{ } class apache::gentoo inherits apache::base { - # $config_dir = '/etc/apache2/' + $config_dir = '/etc/apache2/' # needs module gentoo gentoo::etcconfd { apache2: } @@ -81,6 +81,9 @@ class apache::gentoo inherits apache::base { File[vhosts_dir]{ path => "$config_dir/vhosts.d/", } + apache::vhost::file { '00_default_ssl_vhost': } + apache::vhost::file { '00_default_vhost': } + apache::config::file { 'default_vhost.include': destination => '$config_dir/vhosts.d/default_vhost.include' } } class apache::debian inherits apache::base { @@ -120,16 +123,16 @@ define apache::vhost::file( $real_source = $source ? { '' => [ - "apache/vhosts.d/${fqdn}/${name}.conf", - "dist/apache/vhosts.d/${fqdn}/${name}.conf", - "dist/apache/vhosts.d/${name}.conf" + "puppet://$server/dist/apache/vhosts.d/${fqdn}/${name}.conf", + "puppet://$server/dist/apache/vhosts.d/${name}.conf", + "puppet://$server/apache/vhosts.d/${fqdn}/${name}.conf" ], default => $source, } file{"vhost_${name}.conf": path => $real_destination, - source => "puppet://$server/$real_source", + source => "$real_source", owner => root, group => 0, mode => 0644, @@ -139,16 +142,6 @@ define apache::vhost::file( } } -class apache::vhost::file::defaults { - case $operatingsystem { - gentoo: { - apache::vhost::file { '00_default_ssl_vhost': } - apache::vhost::file { '00_default_vhost': } - apache::vhost::file { 'default_vhost.include': } - } - } -} - define apache::config::file( $source = '', $destination = '' @@ -156,11 +149,11 @@ define apache::config::file( $real_source = $source ? { # get a whole bunch of possible sources if there is no specific source for that config-file '' => [ - "apache/conf/${fqdn}/${name}", - "dist/apache/conf/${fqdn}/${name}", - "apache/conf/${name}.${operatingsystem}.${lsbdistcodename}", - "apache/conf/${name}.${operatingsystem}", - "apache/conf/${name}.Default" + "puppet://$server/apache/conf/${fqdn}/${name}", + "puppet://$server/dist/apache/conf/${fqdn}/${name}", + "puppet://$server/apache/conf/${name}.${operatingsystem}.${lsbdistcodename}", + "puppet://$server/apache/conf/${name}.${operatingsystem}", + "puppet://$server/apache/conf/${name}.Default" ], default => $source, } @@ -179,7 +172,7 @@ define apache::config::file( file{"apache_${name}": path => $real_destination, - source => "puppet://$server/$real_source", + source => $real_source, owner => root, group => 0, mode => 0644, |