diff --git a/manifests/xinetd.pp b/manifests/xinetd.pp index 3e2ca721c74b0e970582a43ca713a39bd58a9d09..c8268f3c7d0a64bdcea2b06dc2418d7c37f88751 100644 --- a/manifests/xinetd.pp +++ b/manifests/xinetd.pp @@ -1,7 +1,14 @@ # Our default inetd system, used by both Red Hat and Debian. class base::xinetd { - package { 'xinetd': ensure => present } + # Make sure conflicting inetd packages are purged + package { + 'openbsd-inetd': + ensure => absent; + 'xinetd': + ensure => present, + require => Package['openbsd-inetd']; + } # Ensure service is running. We have a custom restart action because we # had problems with Puppet starting or restarting xinetd with a broken