diff options
| author | mh <mh@immerda.ch> | 2009-10-31 15:24:26 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2009-10-31 15:24:26 +0100 |
| commit | e41124eb2440f1401c4257f3879aa4c4fb1e792b (patch) | |
| tree | 92a310543165eb8c95d9b7e089a011d7edfb1f14 | |
| parent | 040b0b788ead2e7e1ac0950b1095aad0bbc90377 (diff) | |
refactor everything into it's own file, fix a regression of 0.25
| -rw-r--r-- | manifests/base.pp | 33 | ||||
| -rw-r--r-- | manifests/gentoo.pp | 5 | ||||
| -rw-r--r-- | manifests/init.pp | 43 |
3 files changed, 38 insertions, 43 deletions
diff --git a/manifests/base.pp b/manifests/base.pp new file mode 100644 index 0000000..4392fa4 --- /dev/null +++ b/manifests/base.pp @@ -0,0 +1,33 @@ +class denyhosts::base { + package{denyhosts: + ensure => present, + } + + service{denyhosts: + enable => true, + ensure => running, + require => [ Package[denyhosts], + File["/etc/denyhosts.conf"], + File["/var/lib/denyhosts/allowed-hosts"] ], + } + + file{'/etc/denyhosts.conf': + source => [ "puppet://$server/files/denyhosts/${fqdn}/denyhosts.conf", + "puppet://$server/files/denyhosts/denyhosts.conf", + "puppet://$server/denyhosts/denyhosts.conf" ], + notify => Service[denyhosts], + mode => 0600, owner => root, group => 0; + } + + file{'/var/lib/denyhosts': + ensure => directory, + owner => root, group => 0, mode => 0700; + } + file{'/var/lib/denyhosts/allowed-hosts': + source => [ "puppet://$server/files/denyhosts/${fqdn}/allowed-hosts", + "puppet://$server/files/denyhosts/allowed-hosts", + "puppet://$server/denyhosts/allowed-hosts" ], + notify => Service[denyhosts], + mode => 0600, owner => root, group => 0; + } +} diff --git a/manifests/gentoo.pp b/manifests/gentoo.pp new file mode 100644 index 0000000..46f5ced --- /dev/null +++ b/manifests/gentoo.pp @@ -0,0 +1,5 @@ +class denyhosts::gentoo inherits denyhosts::base { + Package[denyhosts]{ + category => 'app-admin', + } +} diff --git a/manifests/init.pp b/manifests/init.pp index 16f2c7a..0bf1124 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -14,52 +14,9 @@ # denyhosts script. # -# modules_dir { "denyhosts": } - class denyhosts { case $operatingsystem { gentoo: { include denyhosts::gentoo } default: { include denyhosts::base } } } - -class denyhosts::base { - package{denyhosts: - ensure => present, - } - - service{denyhosts: - enable => true, - ensure => running, - require => [ Package[denyhosts], - File["/etc/denyhosts.conf"], - File["/var/lib/denyhosts/allowed-hosts"] ], - } - - file{'/etc/denyhosts.conf': - source => [ "puppet://$server/files/denyhosts/${fqdn}/denyhosts.conf", - "puppet://$server/files/denyhosts/denyhosts.conf", - "puppet://$server/denyhosts/denyhosts.conf" ], - notify => Service[denyhosts], - mode => 0600, owner => root, group => 0; - } - - file{'/var/lib/denyhosts/': - ensure => directory, - owner => root, group => 0, mode => 0700; - } - file{'/var/lib/denyhosts/allowed-hosts': - source => [ "puppet://$server/files/denyhosts/${fqdn}/allowed-hosts", - "puppet://$server/files/denyhosts/allowed-hosts", - "puppet://$server/denyhosts/allowed-hosts" ], - notify => Service[denyhosts], - require => File['/var/lib/denyhosts/'], - mode => 0600, owner => root, group => 0; - } -} - -class denyhosts::gentoo inherits denyhosts::base { - Package[denyhosts]{ - category => 'app-admin', - } -} |