Commit f63438a5 authored by mh's avatar mh
Browse files

Revert "fix the init script so the pidfile is being used"

This reverts commit 52ce456f.

It is fixed https://bugzilla.redhat.com/show_bug.cgi?id=1164925

Conflicts:
	manifests/base.pp
parent cda1cfc4
...@@ -3,16 +3,13 @@ class imapproxy::base { ...@@ -3,16 +3,13 @@ class imapproxy::base {
package {'up-imapproxy': package {'up-imapproxy':
ensure => present, ensure => present,
} -> exec{'fix_imapproxy_init_script':
command => 'sed -i \'s@killproc @killproc -p /var/run/imapproxy.pid @\' /etc/init.d/imapproxy',
onlyif => 'grep -q \'killproc /\' /etc/init.d/imapproxy',
} -> 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' ],
owner => root, owner => root,
group => 0, group => 0,
mode => '0644'; mode => '0644';
} ~> service {'imapproxy': } ~> service {'imapproxy':
ensure => running, ensure => running,
enable => true, enable => true,
......
Markdown is supported
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