Commit ebcd1808 authored by mh's avatar mh
Browse files

refactor things for >2.7

parent e563b9aa
class imapproxy::base { class imapproxy::base {
package { up-imapproxy: package { up-imapproxy:
ensure => present, ensure => present,
} }
file{'/etc/imapproxy.conf': file{'/etc/imapproxy.conf':
source => [ "puppet:///modules/site-imapproxy/${fqdn}/imapproxy.conf", source => [ "puppet:///modules/site_imapproxy/${::fqdn}/imapproxy.conf",
"puppet:///modules/site-imapproxy/imapproxy.conf", "puppet:///modules/site_imapproxy/imapproxy.conf",
"puppet:///modules/imapproxy/imapproxy.conf" ], "puppet:///modules/imapproxy/imapproxy.conf" ],
require => Package[up-imapproxy], require => Package[up-imapproxy],
notify => Service[imapproxy], notify => Service[imapproxy],
owner => root, group => 0, mode => 0644; owner => root, group => 0, mode => 0644;
} }
service {'imapproxy': service {'imapproxy':
ensure => running, ensure => running,
enable => true, enable => true,
} }
} }
class imapproxy::disable inherits imapproxy { class imapproxy::disable inherits imapproxy {
case $operatingsystem { case $::operatingsystem {
default: { include imapproxy::disable::base } default: { include imapproxy::disable::base }
} }
} }
class imapproxy::gentoo inherits imapproxy::base { class imapproxy::gentoo inherits imapproxy::base {
Package[up-imapproxy]{ Package[up-imapproxy]{
category => 'net-mail', category => 'net-mail',
} }
} }
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
# #
class imapproxy { class imapproxy {
case $operatingsystem { case $::operatingsystem {
gentoo: { include imapproxy::gentoo } gentoo: { include imapproxy::gentoo }
default: { include imapproxy::base } default: { include imapproxy::base }
} }
if $use_shorewall { if hiera('use_shorewall',false) {
include shorewall::rules::out::imap include shorewall::rules::out::imap
} }
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment