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

Install netbase for /etc/services on Ubuntu 20.04 #269

Merged
merged 12 commits into from
Feb 6, 2025
Merged

Install netbase for /etc/services on Ubuntu 20.04 #269

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c932a95
modulesync 9.1.0
bastelfreak Jul 9, 2024
f90426f
modulesync 9.2.0
bastelfreak Sep 13, 2024
2a649e6
Switch unit tests to CERN runner
bastelfreak Sep 13, 2024
74595d3
modulesync 9.3.0
bastelfreak Sep 16, 2024
1d33129
modulesync 9.4.0
bastelfreak Feb 5, 2025
dab19d2
regenerate REFERENCE.md
kenyon Feb 5, 2025
aedd932
set service provider to systemd in unit tests
bastelfreak Feb 5, 2025
6097389
init.pp: Purge trailing whitespace
bastelfreak Feb 5, 2025
123bfa9
Drop Puppet 7 testing
bastelfreak Feb 5, 2025
8ef25aa
Install netbase for /etc/services file
traylenator Feb 6, 2025
c88d259
Revert "Install netbase for /etc/services file"
traylenator Feb 6, 2025
8f4434e
Install netbase for /etc/services on Ubuntu 20.04
traylenator Feb 6, 2025
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
7 changes: 7 additions & 0 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,13 @@
ensure => installed,
}

# /etc/services file is needed, on newer OSes this is a dependency on nftables
if $facts['os']['name'] == 'Ubuntu' and $facts['os']['release']['major'] == '20.04' {
package { 'netbase':
bastelfreak marked this conversation as resolved.
Show resolved Hide resolved
ensure => present,
}
}

if $clobber_default_config {
file { $configuration_path:
ensure => file,
Expand Down
7 changes: 7 additions & 0 deletions spec/classes/nftables_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@

it { is_expected.to contain_package('nftables') }

case [os_facts[:os]['name'], os_facts[:os]['release']['major']]
when ['Ubuntu', '20.04']
it { is_expected.to contain_package('netbase') }
else
it { is_expected.not_to contain_package('netbase') }
end

context 'with clobber_default_config false' do
let(:params) do
{ clobber_default_config: false }
Expand Down
Loading