Remove legacy facts (89c3beb8) · Commits · Projets publics / Puppet Camptocamp Postfix

data/osfamily/Suse/11.yaml

+1 −1

Original line number	Diff line number	Diff line
		---
		postfix::params::restart_cmd: '/etc/init.d/postfix reload'
		postfix::params::master_os_template: "postfix/master.cf.SLES%{::operatingsystemrelease}.erb"
		postfix::params::master_os_template: "postfix/master.cf.SLES%{facts.os.release.full}.erb"
		...

hiera.yaml

+2 −2

Original line number	Diff line number	Diff line
		@@ -10,8 +10,8 @@ hierarchy:

		- name: "Per-OS family"
		paths:
		- "osfamily/%{facts.os.family}/%{facts.lsbdistcodename}.yaml"
		- "osfamily/%{facts.os.family}/%{facts.operatingsystemmajrelease}.yaml"
		- "osfamily/%{facts.os.family}/%{facts.os.distro.codename}.yaml"
		- "osfamily/%{facts.os.family}/%{facts.os.release.major}.yaml"
		- "osfamily/%{facts.os.family}.yaml"

		- name: "Common data"

spec/acceptance/postfix_spec.rb

+4 −4

Original line number	Diff line number	Diff line
		@@ -7,14 +7,14 @@ describe 'postfix class' do
		it 'works idempotently with no errors' do
		pp = <<-EOS
		# Make sure the default mailer is stopped in docker containers
		if $::operatingsystem == 'Debian' {
		if fact('os.name') == 'Debian' {
		service { 'exim4':
		ensure => stopped,
		hasstatus => false,
		before => Class['postfix'],
		}
		}
		if $::osfamily == 'RedHat' {
		if fact('os.family') == 'RedHat' {
		service { 'sendmail':
		ensure => stopped,
		hasstatus => false,
		@@ -50,14 +50,14 @@ describe 'postfix class' do
		it 'works idempotently with no errors and with your own configuration of /etc/aliases' do
		pp = <<-EOS
		# Make sure the default mailer is stopped in docker containers
		if $::operatingsystem == 'Debian' {
		if fact('os.name') == 'Debian' {
		service { 'exim4':
		ensure => stopped,
		hasstatus => false,
		before => Class['postfix'],
		}
		}
		if $::osfamily == 'RedHat' {
		if fact('os.family') == 'RedHat' {
		service { 'sendmail':
		ensure => stopped,
		hasstatus => false,

spec/classes/postfix_spec.rb

+12 −12

Original line number	Diff line number	Diff line
		@@ -6,31 +6,31 @@ describe 'postfix' do
		on_supported_os.each do \|os, facts\|
		context "on #{os}" do # rubocop:disable RSpec/MultipleMemoizedHelpers
		let(:postfix_main_cf_path) do
		case facts[:osfamily]
		case facts[:os]['family']
		when 'FreeBSD' then '/usr/local/etc/postfix/main.cf'
		else '/etc/postfix/main.cf'
		end
		end
		let(:postfix_master_cf_path) do
		case facts[:osfamily]
		case facts[:os]['family']
		when 'FreeBSD' then '/usr/local/etc/postfix/master.cf'
		else '/etc/postfix/master.cf'
		end
		end
		let(:postfix_transport_path) do
		case facts[:osfamily]
		case facts[:os]['family']
		when 'FreeBSD' then '/usr/local/etc/postfix/transport'
		else '/etc/postfix/transport'
		end
		end
		let(:postfix_virtual_path) do
		case facts[:osfamily]
		case facts[:os]['family']
		when 'FreeBSD' then '/usr/local/etc/postfix/virtual'
		else '/etc/postfix/virtual'
		end
		end
		let(:postfix_path) do
		case facts[:osfamily]
		case facts[:os]['family']
		when 'FreeBSD' then '/usr/local/etc/postfix'
		else '/etc/postfix'
		end
		@@ -60,7 +60,7 @@ describe 'postfix' do
		it { is_expected.to contain_augeas("manage postfix 'inet_interfaces'").with_changes("set inet_interfaces 'all'") }
		it { is_expected.to contain_augeas("manage postfix 'inet_protocols'").with_changes("set inet_protocols 'all'") }

		context 'when on Debian family', if: facts[:osfamily] == 'Debian' do # rubocop:disable RSpec/MultipleMemoizedHelpers
		context 'when on Debian family', if: facts[:os]['family'] == 'Debian' do # rubocop:disable RSpec/MultipleMemoizedHelpers
		it { is_expected.to contain_package('mailx') }
		it { is_expected.to contain_file('/etc/mailname').without('seltype').with_content("foo.example.com\n") }
		it { is_expected.to contain_file('/etc/aliases').without('seltype').with_content("# file managed by puppet\n") }
		@@ -77,7 +77,7 @@ describe 'postfix' do
		}
		end

		context 'when on RedHat family', if: facts[:osfamily] == 'RedHat' do # rubocop:disable RSpec/MultipleMemoizedHelpers
		context 'when on RedHat family', if: facts[:os]['family'] == 'RedHat' do # rubocop:disable RSpec/MultipleMemoizedHelpers
		it { is_expected.to contain_package('mailx') }
		it { is_expected.to contain_file('/etc/mailname').with_seltype('postfix_etc_t').with_content("foo.example.com\n") }
		it { is_expected.to contain_file(postfix_master_cf_path).with_seltype('postfix_etc_t') }
		@@ -91,7 +91,7 @@ describe 'postfix' do
		it { is_expected.to contain_augeas("manage postfix 'mailq_path'") }
		it { is_expected.to contain_alternatives('mta') }

		context 'when on release 8', if: (facts[:osfamily] == 'RedHat' && facts[:operatingsystemmajrelease] == '8') do # rubocop:disable RSpec/MultipleMemoizedHelpers
		context 'when on release 8', if: (facts[:os]['family'] == 'RedHat' && facts[:operatingsystemmajrelease] == '8') do # rubocop:disable RSpec/MultipleMemoizedHelpers
		it { is_expected.to contain_file('/etc/aliases').with_seltype('etc_aliases_t').with_content("# file managed by puppet\n") }

		it {
		@@ -104,7 +104,7 @@ describe 'postfix' do
		}
		end

		context 'when on release 7', if: (facts[:osfamily] == 'RedHat' && facts[:operatingsystemmajrelease] == '7') do # rubocop:disable RSpec/MultipleMemoizedHelpers
		context 'when on release 7', if: (facts[:os]['family'] == 'RedHat' && facts[:operatingsystemmajrelease] == '7') do # rubocop:disable RSpec/MultipleMemoizedHelpers
		it { is_expected.to contain_file('/etc/aliases').with_seltype('etc_aliases_t').with_content("# file managed by puppet\n") }

		it {
		@@ -117,7 +117,7 @@ describe 'postfix' do
		}
		end

		context 'when on release 6', if: (facts[:osfamily] == 'RedHat' && facts[:operatingsystemmajrelease] == '6') do # rubocop:disable RSpec/MultipleMemoizedHelpers
		context 'when on release 6', if: (facts[:os]['family'] == 'RedHat' && facts[:operatingsystemmajrelease] == '6') do # rubocop:disable RSpec/MultipleMemoizedHelpers
		it { is_expected.to contain_file('/etc/aliases').with_seltype('etc_aliases_t').with_content("# file managed by puppet\n") }

		it {
		@@ -131,7 +131,7 @@ describe 'postfix' do
		end
		end

		context 'when on Fedora', if: facts[:operatingsystem] == 'Fedora' do # rubocop:disable RSpec/MultipleMemoizedHelpers
		context 'when on Fedora', if: facts[:os]['name'] == 'Fedora' do # rubocop:disable RSpec/MultipleMemoizedHelpers
		it { is_expected.to contain_file('/etc/aliases').with_seltype('etc_aliases_t').with_content("# file managed by puppet\n") }

		it {
		@@ -247,7 +247,7 @@ describe 'postfix' do
		is_expected.to contain_file("#{postfix_path}/ldap-aliases.cf")
		end

		context 'when on Debian family', if: facts[:osfamily] == 'Debian' do # rubocop:disable RSpec/MultipleMemoizedHelpers
		context 'when on Debian family', if: facts[:os]['family'] == 'Debian' do # rubocop:disable RSpec/MultipleMemoizedHelpers
		it { is_expected.to contain_package('postfix-ldap') }
		end
		end

spec/defines/postfix_config_spec.rb

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ describe 'postfix::config' do
		on_supported_os.each do \|os, facts\|
		context "on #{os}" do
		let(:postfix_main_cf_path) do
		case facts[:osfamily]
		case facts[:os]['family']
		when 'FreeBSD' then '/usr/local/etc/postfix/main.cf'
		else '/etc/postfix/main.cf'
		end