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

Jump to bottom

Add RHEL9 #448

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add RHEL9 #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cfc487
Add RHEL9
yakatz Jul 3, 2023
ad7a3df
Fix tests for newer RHEL versions
yakatz Jul 3, 2023
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
2 changes: 2 additions & 0 deletions data/family/RedHat/9.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
openvpn::server_directory: '/etc/openvpn/server'
openvpn::server_service_name: 'openvpn-server'
3 changes: 2 additions & 1 deletion metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
{
"operatingsystem": "RedHat",
"operatingsystemrelease": [
"8"
"8",
"9"
]
},
{
Expand Down
10 changes: 5 additions & 5 deletions spec/acceptance/openvpn_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@

case fact('osfamily')
when 'RedHat'
if fact('os.release.major') == '8'
server_directory = '/etc/openvpn/server'
client_directory = '/etc/openvpn/client'
client_service = 'openvpn-client'
else
if fact('os.release.major') == '7'
server_directory = '/etc/openvpn'
client_directory = '/etc/openvpn'
client_service = 'openvpn'
else
server_directory = '/etc/openvpn/server'
client_directory = '/etc/openvpn/client'
client_service = 'openvpn-client'
end
server_crt = "#{server_directory}/test_openvpn_server/easy-rsa/keys/issued/server.crt"
key_path = "#{server_directory}/test_openvpn_server/easy-rsa/keys/private"
Expand Down
6 changes: 3 additions & 3 deletions spec/defines/openvpn_ca_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@

case facts[:os]['family']
when 'RedHat'
server_directory = if facts[:os]['release']['major'] == '8'
'/etc/openvpn/server'
else
server_directory = if facts[:os]['release']['major'] == '7'
'/etc/openvpn'
else
'/etc/openvpn/server'
end

context 'creating a server with the minimum parameters' do
Expand Down
6 changes: 3 additions & 3 deletions spec/defines/openvpn_client_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@

server_directory = case facts[:os]['family']
when 'CentOS', 'RedHat'
if facts[:os]['release']['major'] == '8'
'/etc/openvpn/server'
else
if facts[:os]['release']['major'] == '7'
'/etc/openvpn'
else
'/etc/openvpn/server'
end
else
'/etc/openvpn'
Expand Down
6 changes: 3 additions & 3 deletions spec/defines/openvpn_client_specific_config_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@

server_directory = case facts[:os]['family']
when 'CentOS', 'RedHat'
if facts[:os]['release']['major'] == '8'
'/etc/openvpn/server'
else
if facts[:os]['release']['major'] == '7'
'/etc/openvpn'
else
'/etc/openvpn/server'
end
else
'/etc/openvpn'
Expand Down
6 changes: 3 additions & 3 deletions spec/defines/openvpn_server_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@

server_directory = case facts[:os]['family']
when 'CentOS', 'RedHat'
if facts[:os]['release']['major'] == '8'
'/etc/openvpn/server'
else
if facts[:os]['release']['major'] == '7'
'/etc/openvpn'
else
'/etc/openvpn/server'
end
when %r{FreeBSD}
'/usr/local/etc/openvpn'
Expand Down
Loading