Skip to content

Commit

Permalink
Rocky Linux + AlmaLinux support (#168)
Browse files Browse the repository at this point in the history
* add EL9 to meta/main.yml

* require Ansible >= 2.11 as Rocky Linux is only supported with this version or above

* ansible-lint: use community.general.pacman module instead of ansible.builtin.pacman for Archlinux setup

* add support for Rocky Linux 9 and AlmaLinux 9

* add openSUSE Leap 15.4 to README.md

* update CHANGELOG.md
  • Loading branch information
githubixx authored Nov 14, 2022
1 parent 3821005 commit f4573c5
Show file tree
Hide file tree
Showing 7 changed files with 62 additions and 2 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ SPDX-License-Identifier: GPL-3.0-or-later

# Changelog

## 11.0.0

- add support for Rocky Linux 9 (original PR from @vincentDcmps: https://github.com/githubixx/ansible-role-wireguard/pull/163)
- add support for AlamaLinux 9 (original PR from @trunet: https://github.com/githubixx/ansible-role-wireguard/pull/164)
- add `EL9` to `meta/main.yml`
- require Ansible >= `2.11` as Rocky Linux is only supported with this version or above
- `ansible-lint`: use `community.general.pacman` module instead of `ansible.builtin.pacman` for Archlinux setup

## 10.0.0

- remove Fedora 34 + add Fedora 36 to Molecule test
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ This role should work with:
- AlmaLinux
- Rocky Linux
- openSUSE Leap 15.3
- openSUSE Leap 15.4

Molecule tests are [available](https://github.com/githubixx/ansible-role-wireguard#testing) (see further down below). It should also work with `Raspbian Buster` but for this one there is no test available. MacOS (see below) should also work partitially but is only best effort.

Expand Down
3 changes: 2 additions & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ galaxy_info:
author: Robert Wimmer
description: Installs Wireguard incl. systemd integration
license: GPL-3.0-or-later
min_ansible_version: "2.9"
min_ansible_version: "2.11"
namespace: githubixx
role_name: ansible_role_wireguard
platforms:
Expand All @@ -24,6 +24,7 @@ galaxy_info:
versions:
- "7"
- "8"
- "9"
- name: Fedora
versions:
- "35"
Expand Down
34 changes: 34 additions & 0 deletions molecule/kvm/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,30 @@ platforms:
groups:
- vpn
- opensuse
- name: test-wg-rocky9
box: generic/rocky9
memory: 1024
cpus: 2
interfaces:
- auto_config: true
network_name: private_network
type: static
ip: 192.168.10.160
groups:
- vpn
- el9
- name: test-wg-alma9
box: generic/alma9
memory: 1024
cpus: 2
interfaces:
- auto_config: true
network_name: private_network
type: static
ip: 192.168.10.170
groups:
- vpn
- el9

provisioner:
name: ansible
Expand Down Expand Up @@ -287,6 +311,16 @@ provisioner:
wireguard_port: 51820
wireguard_persistent_keepalive: "30"
wireguard_endpoint: "192.168.10.150"
test-wg-rocky9:
wireguard_address: "10.10.10.160/24"
wireguard_port: 51820
wireguard_persistent_keepalive: "30"
wireguard_endpoint: "192.168.10.160"
test-wg-alma9:
wireguard_address: "10.10.10.170/24"
wireguard_port: 51820
wireguard_persistent_keepalive: "30"
wireguard_endpoint: "192.168.10.170"

scenario:
name: kvm
Expand Down
8 changes: 8 additions & 0 deletions tasks/setup-almalinux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
# Copyright (C) 2022 Robert Wimmer
# SPDX-License-Identifier: GPL-3.0-or-later

- name: (AlmaLinux) Install wireguard-tools package
ansible.builtin.yum:
name: wireguard-tools
state: present
2 changes: 1 addition & 1 deletion tasks/setup-archlinux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
# SPDX-License-Identifier: GPL-3.0-or-later

- name: (Archlinux) Install wireguard-tools package
ansible.builtin.pacman:
community.general.pacman:
name: wireguard-tools
state: present
8 changes: 8 additions & 0 deletions tasks/setup-rocky.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
# Copyright (C) 2022 Robert Wimmer
# SPDX-License-Identifier: GPL-3.0-or-later

- name: (Rocky Linux) Install wireguard-tools package
ansible.builtin.yum:
name: wireguard-tools
state: present

0 comments on commit f4573c5

Please sign in to comment.