From 7ce3190986cf8e5fe037a7ccd4c1076505b117f4 Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 12 Jul 2016 16:41:59 -0400 Subject: remove submodules in preparation for move to subrepos Change-Id: Ia7655153b556337f676e3d909559c4a7306bedd6 --- puppet/modules/postfix | 1 - 1 file changed, 1 deletion(-) delete mode 160000 puppet/modules/postfix (limited to 'puppet/modules/postfix/manifests/disable') diff --git a/puppet/modules/postfix b/puppet/modules/postfix deleted file mode 160000 index cce918f7..00000000 --- a/puppet/modules/postfix +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cce918f784ebf8a8875f43c79bc3a1f39ab9456b -- cgit v1.2.3 From 5247b7ccf5b5889ee16262dd976b03047e34e32c Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 12 Jul 2016 16:46:25 -0400 Subject: git subrepo clone https://leap.se/git/puppet_postfix puppet/modules/postfix subrepo: subdir: "puppet/modules/postfix" merged: "cce918f" upstream: origin: "https://leap.se/git/puppet_postfix" branch: "master" commit: "cce918f" git-subrepo: version: "0.3.0" origin: "https://github.com/ingydotnet/git-subrepo" commit: "1e79595" Change-Id: I325a79fe1780ee6a5d61959310cf8e52c9a6896f --- puppet/modules/postfix/manifests/disable/base.pp | 12 ++++++++++++ puppet/modules/postfix/manifests/disable/debian.pp | 11 +++++++++++ 2 files changed, 23 insertions(+) create mode 100644 puppet/modules/postfix/manifests/disable/base.pp create mode 100644 puppet/modules/postfix/manifests/disable/debian.pp (limited to 'puppet/modules/postfix/manifests/disable') diff --git a/puppet/modules/postfix/manifests/disable/base.pp b/puppet/modules/postfix/manifests/disable/base.pp new file mode 100644 index 00000000..5c56c709 --- /dev/null +++ b/puppet/modules/postfix/manifests/disable/base.pp @@ -0,0 +1,12 @@ +class postfix::disable::base { + + service{'postfix': + ensure => stopped, + enable => false, + } + package{'postfix': + ensure => absent, + require => Service['postfix'], + } + +} diff --git a/puppet/modules/postfix/manifests/disable/debian.pp b/puppet/modules/postfix/manifests/disable/debian.pp new file mode 100644 index 00000000..213efc50 --- /dev/null +++ b/puppet/modules/postfix/manifests/disable/debian.pp @@ -0,0 +1,11 @@ +# debian has some issues with absent +# init scripts. +# It's a bug in debian's provider that should be fixed in puppet, but in the +# meantime we need this hack. +# +# see: https://projects.puppetlabs.com/issues/9381 +class postfix::disable::debian inherits postfix::disable::base { + Service['postfix']{ + hasstatus => false, + } +} -- cgit v1.2.3