diff options
| author | andreas <andreas@immerda.ch> | 2008-03-01 12:58:03 +0000 |
|---|---|---|
| committer | andreas <andreas@immerda.ch> | 2008-03-01 12:58:03 +0000 |
| commit | 0e2428a3c93538ab26a78fafef547bbb462446f1 (patch) | |
| tree | 9f1afac24d3f019465bea5252b673850f0123e82 /manifests/init.pp | |
| parent | b7520e6535cb03c0672d12afb87ab210e809763e (diff) | |
test mit variable
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index b4ce916..3c3e93a 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -13,14 +13,16 @@ class apache { #include apache::gentoo - $vhosts_dir = $operatingsystem ? { - centos => "$apache::centos::config_dir/vhosts.d/", - gentoo => "$apache::gentoo::config_dir/vhosts.d/", - debian => "$apache::debian::config_dir/vhosts.d/", - ubuntu => "$apache::ubuntu::config_dir/vhosts.d/", - openbsd => "$apache::openbsd::config_dir/vhosts.d/", - default => '/etc/apache2/vhosts.d/', - } +# $vhosts_dir = $operatingsystem ? { +# centos => "$apache::centos::config_dir/vhosts.d/", +# gentoo => "$apache::gentoo::config_dir/vhosts.d/", +# debian => "$apache::debian::config_dir/vhosts.d/", +# ubuntu => "$apache::ubuntu::config_dir/vhosts.d/", +# openbsd => "$apache::openbsd::config_dir/vhosts.d/", +# default => '/etc/apache2/vhosts.d/', +# } + + $vhosts_dir = "$config_dir/vhosts.d/" file{ $vhosts_dir: @@ -78,7 +80,7 @@ class apache::centos inherits apache::base{ } class apache::gentoo inherits apache::base { - $config_dir = '/etc/apache2/' + # $config_dir = '/etc/apache2/' Package[apache]{ category => 'www-servers', } @@ -104,6 +106,7 @@ define apache::vhost::file( $source = '', $destination = '' ){ + $vhosts_dir = "$config_dir/vhosts.d/" # $vhosts_dir = $operatingsystem ? { # centos => "$apache::centos::config_dir/vhosts.d/", # gentoo => "$apache::gentoo::config_dir/vhosts.d/", |