diff --git a/manifests/config.pp b/manifests/config.pp index b499d927..ebae8601 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -55,14 +55,7 @@ mode => '0750', } - file { $pulpcore::allowed_import_path: - ensure => directory, - owner => $pulpcore::user, - group => $pulpcore::group, - mode => '0770', - } - - file { $pulpcore::allowed_export_path: + file { unique($pulpcore::allowed_import_path + $pulpcore::allowed_export_path): ensure => directory, owner => $pulpcore::user, group => $pulpcore::group, diff --git a/spec/classes/pulpcore_spec.rb b/spec/classes/pulpcore_spec.rb index 85aa3966..4d0b250f 100644 --- a/spec/classes/pulpcore_spec.rb +++ b/spec/classes/pulpcore_spec.rb @@ -202,6 +202,17 @@ :group => 'pulp' ) end + + context 'with overlapping allowed export paths' do + let(:params) { super().merge(allowed_export_path: ['/tmp/imports', '/tmp/exports']) } + + it do + is_expected.to compile.with_all_deps + is_expected.to contain_file('/tmp/imports') + is_expected.to contain_file('/tmp/imports1') + is_expected.to contain_file('/tmp/exports') + end + end end context 'with allowed export paths' do