From 256105ac5641b5b28cb0edff3d7437cf5f6105c7 Mon Sep 17 00:00:00 2001 From: Micah Date: Thu, 3 Dec 2015 20:12:56 -0500 Subject: Make sure /etc/default and config file are there before service is triggered (#7618) Change-Id: Ib9fa598a94e8fd41329b1c9ed4bb52281bf04992 --- puppet/modules/postfwd/files/postfwd_default | 2 +- puppet/modules/postfwd/manifests/init.pp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/puppet/modules/postfwd/files/postfwd_default b/puppet/modules/postfwd/files/postfwd_default index 79d0e3de..83742e40 100644 --- a/puppet/modules/postfwd/files/postfwd_default +++ b/puppet/modules/postfwd/files/postfwd_default @@ -13,7 +13,7 @@ PORT=10040 # run as user postfwd RUNAS="postfw" # Arguments passed on start (--daemon implied) -# RISEUP disable summary and cache-no-size +# disable summary and cache-no-size #ARGS="--summary=600 --cache=600 --cache-rdomain-only --cache-no-size" ARGS="--cache=600 --cache-rdomain-only --no-rulestats" diff --git a/puppet/modules/postfwd/manifests/init.pp b/puppet/modules/postfwd/manifests/init.pp index 1ebc1d53..6db3fa52 100644 --- a/puppet/modules/postfwd/manifests/init.pp +++ b/puppet/modules/postfwd/manifests/init.pp @@ -18,14 +18,15 @@ class postfwd { mode => '0644', owner => root, group => root, - require => Package['postfwd']; + before => Package['postfwd']; '/etc/postfix/postfwd.cf': content => template('postfwd/postfwd.cf.erb'), mode => '0644', owner => root, group => root, - require => Package['postfix']; + require => Package['postfix'], + before => Package['postfwd']; } service { -- cgit v1.2.3