Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(SIMP-8075) Update Dependencies #70

Merged
merged 5 commits into from
Aug 19, 2020
Merged

(SIMP-8075) Update Dependencies #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3b919e5
(SIMP-7974) Fix `when: never` rule regex
op-ct Jul 29, 2020
d089f6f
(SIMP-8075) Update Dependencies
jeannegreulich Jul 29, 2020
1b5eab1
Add iptables precise matching to the test
trevor-vaughan Aug 18, 2020
9e883ae
Remove testing retries
trevor-vaughan Aug 18, 2020
305e3a2
Update .gitlab-ci.yml
jeannegreulich Aug 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .fixtures.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ fixtures:
selinux_core: https://github.com/puppetlabs/puppetlabs-selinux_core
simp_firewalld: https://github.com/simp/pupmod-simp-simp_firewalld
simp_options: https://github.com/simp/pupmod-simp-simp_options
simp_firewalld: https://github.com/simp/pupmod-simp-simp_firewalld
simplib: https://github.com/simp/pupmod-simp-simplib
simpcat: https://github.com/simp/pupmod-simp-simpcat
stdlib: https://github.com/simp/puppetlabs-stdlib
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
* Wed Jul 29 2020 Jeanne Greulich <jeanne.greulich@onyxpoint.com> - 6.4.1-0
- Update upper bound for vox_selinux to < 4.0.0

* Fri Jan 10 2020 Liz Nemsick <lnemsick.simp@gmail.com> - 6.4.0-0
- Add EL8 support
- Update the upper bound of simp-simplib to < 5.0.0
Expand Down
4 changes: 2 additions & 2 deletions metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "simp-rsync",
"version": "6.4.0",
"version": "6.4.1",
"author": "SIMP Team",
"summary": "manage an rsync server, secured by stunnel",
"license": "Apache-2.0",
Expand Down Expand Up @@ -35,7 +35,7 @@
},
{
"name": "simp/vox_selinux",
"version_requirement": ">= 1.5.2 < 2.0.0"
"version_requirement": ">= 1.5.2 < 4.0.0"
}
],
"operatingsystem_support": [
Expand Down
5 changes: 3 additions & 2 deletions spec/acceptance/suites/default/00_default_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@
}

let(:hieradata) {{
'simp_options::pki' => false,
'rsync::server::stunnel' => false
'iptables::precise_match' => true,
'simp_options::pki' => false,
'rsync::server::stunnel' => false
}}

hosts.each do |host|
Expand Down
3 changes: 2 additions & 1 deletion spec/acceptance/suites/default/10_server_client_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
}

let(:hieradata_server1) {{
'iptables::precise_match' => true,
'simp_options::pki' => false,
'simp_options::firewall' => true,
'rsync::server::stunnel' => false,
Expand All @@ -89,6 +90,7 @@
}}

let(:hieradata_server2) {{
'iptables::precise_match' => true,
'simp_options::pki' => false,
'simp_options::firewall' => true,
'rsync::server::stunnel' => false,
Expand Down Expand Up @@ -125,7 +127,6 @@
end
end
end

end

context 'test a file retrieval' do
Expand Down
4 changes: 3 additions & 1 deletion spec/acceptance/suites/default/20_server_client_stunnel_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@
}

let(:hieradata_server1) {{
'iptables::precise_match' => true,
'simp_options::pki' => true,
'simp_options::pki::source' => '/etc/pki/simp-testing/pki',
'simp_options::firewall' => true,
Expand All @@ -135,11 +136,12 @@
}}

let(:hieradata_server2) {{
'iptables::precise_match' => true,
'simp_options::pki' => true,
'simp_options::pki::source' => '/etc/pki/simp-testing/pki',
'simp_options::firewall' => true,
'rsync::server::stunnel' => true,
'rsync::server::global::port' => 8873,
'rsync::server::global::port' => 8873,
'rsync::server::trusted_nets' => [server1_ip],
}}

Expand Down