diff options
| author | mh <mh@immerda.ch> | 2009-05-17 22:43:13 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2009-05-17 22:43:13 +0200 |
| commit | f863b7bb49f42841c36776aa61f21e64e2c826eb (patch) | |
| tree | 603210f838404c71d9c39fc267dd1791619f69d8 /manifests | |
| parent | e9350c7225b73a3eaa31aa18eb5e3db46887c1a9 (diff) | |
correct subclassing
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/base/itk.pp | 4 | ||||
| -rw-r--r-- | manifests/centos/itk.pp | 5 | ||||
| -rw-r--r-- | manifests/package/itk.pp | 6 |
3 files changed, 7 insertions, 8 deletions
diff --git a/manifests/base/itk.pp b/manifests/base/itk.pp index 8a25bc5..7772bfd 100644 --- a/manifests/base/itk.pp +++ b/manifests/base/itk.pp @@ -1,8 +1,4 @@ class apache::base::itk inherits apache::base { - Package['apache'] { - name => 'apache2-itk', - } - File['htpasswd_dir']{ group => 0, mode => 0644, diff --git a/manifests/centos/itk.pp b/manifests/centos/itk.pp index 8b55110..8ba6c54 100644 --- a/manifests/centos/itk.pp +++ b/manifests/centos/itk.pp @@ -1,9 +1,6 @@ # http://hostby.net/home/2008/07/12/centos-5-and-mpm-itk/ class apache::centos::itk inherits apache::centos { - include ::apache::base::itk - Package['apache']{ - name => 'httpd-itk', - } + include ::apache::package::itk File['/etc/sysconfig/httpd']{ source => [ "puppet://$server/files/apache/sysconfig/${fqdn}/httpd.itk", "puppet://$server/files/apache/sysconfig/httpd.itk", diff --git a/manifests/package/itk.pp b/manifests/package/itk.pp new file mode 100644 index 0000000..8a103d4 --- /dev/null +++ b/manifests/package/itk.pp @@ -0,0 +1,6 @@ +class apache::package::itk inherits apache::package { + Package['apache'] { + name => 'apache2-itk', + } +} + |