Skip to content

Commit

Permalink
Distro and namespace updates
Browse files Browse the repository at this point in the history
  • Loading branch information
bviktor committed Nov 12, 2023
1 parent 3de6c32 commit 606770f
Show file tree
Hide file tree
Showing 13 changed files with 49 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .githooks/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash

yamllint --strict .
ansible-lint --strict
ansible-lint --strict --offline
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: Fedora 37
name: Fedora 38

on: # yamllint disable-line rule:truthy
push:
Expand All @@ -18,7 +18,7 @@ jobs:
- name: Test Galaxy role
run: >
CONT_ID=$(podman run --rm -v ${{ github.workspace }}:/repo -v /sys/fs/cgroup:/sys/fs/cgroup:ro
--tmpfs /tmp --tmpfs /run --privileged --detach bviktor/ansible-systemd-fedora:37) &&
--tmpfs /tmp --tmpfs /run --privileged --detach bviktor/ansible-systemd-fedora:38) &&
podman exec ${CONT_ID} /bin/bash -c
"./install.sh --extra-vars 'skip_kfgame=true' <<< y &&
./uninstall.sh <<< y &&
Expand Down
26 changes: 26 additions & 0 deletions .github/workflows/fedora-39.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
name: Fedora 39

on: # yamllint disable-line rule:truthy
push:
branches:
- main
- master
pull_request:
branches: []

jobs:
ansible-ci:
runs-on: ubuntu-latest
steps:
- name: Obtain sources
uses: actions/checkout@v3
- name: Test Galaxy role
run: >
CONT_ID=$(podman run --rm -v ${{ github.workspace }}:/repo -v /sys/fs/cgroup:/sys/fs/cgroup:ro
--tmpfs /tmp --tmpfs /run --privileged --detach bviktor/ansible-systemd-fedora:39) &&
podman exec ${CONT_ID} /bin/bash -c
"./install.sh --extra-vars 'skip_kfgame=true' <<< y &&
./uninstall.sh <<< y &&
./install.sh --extra-vars 'skip_kfgame=true kf2_classic=true' <<< y" &&
podman stop ${CONT_ID}
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
| Linter || [![Lint](https://github.com/noobient/killinuxfloor/actions/workflows/lint.yml/badge.svg)](https://github.com/noobient/killinuxfloor/actions/workflows/lint.yml) |
| AlmaLinux 8 || [![AlmaLinux 8](https://github.com/noobient/killinuxfloor/actions/workflows/almalinux-8.yml/badge.svg)](https://github.com/noobient/killinuxfloor/actions/workflows/almalinux-8.yml) |
| AlmaLinux 9 || [![AlmaLinux 9](https://github.com/noobient/killinuxfloor/actions/workflows/almalinux-9.yml/badge.svg)](https://github.com/noobient/killinuxfloor/actions/workflows/almalinux-9.yml) |
| Fedora 37 || [![Fedora 37](https://github.com/noobient/killinuxfloor/actions/workflows/fedora-37.yml/badge.svg)](https://github.com/noobient/killinuxfloor/actions/workflows/fedora-37.yml) |
| Fedora 38 || [![Fedora 38](https://github.com/noobient/killinuxfloor/actions/workflows/fedora-38.yml/badge.svg)](https://github.com/noobient/killinuxfloor/actions/workflows/fedora-38.yml) |
| Fedora 39 || [![Fedora 39](https://github.com/noobient/killinuxfloor/actions/workflows/fedora-39.yml/badge.svg)](https://github.com/noobient/killinuxfloor/actions/workflows/fedora-39.yml) |
| Ubuntu 20.04 || [![Ubuntu 20.04](https://github.com/noobient/killinuxfloor/actions/workflows/ubuntu-20.04.yml/badge.svg)](https://github.com/noobient/killinuxfloor/actions/workflows/ubuntu-20.04.yml) |
| Ubuntu 22.04 || [![Ubuntu 22.04](https://github.com/noobient/killinuxfloor/actions/workflows/ubuntu-22.04.yml/badge.svg)](https://github.com/noobient/killinuxfloor/actions/workflows/ubuntu-22.04.yml) |

Expand Down
12 changes: 6 additions & 6 deletions requirements.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
- src: bviktor.firewalld
- src: bviktor.github_release
- src: bviktor.logrotate
- src: bviktor.selinux_cil
- src: bviktor.servicecheck
- src: bviktor.thirdparty
- src: noobient.firewalld
- src: noobient.github_release
- src: noobient.logrotate
- src: noobient.selinux_cil
- src: noobient.servicecheck
- src: noobient.thirdparty
2 changes: 1 addition & 1 deletion roles/install/tasks/autokick.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
when: ansible_os_family == 'Debian'

- include_role:
name: bviktor.thirdparty
name: noobient.thirdparty
vars:
name: Yarn
gpg_url: "https://dl.yarnpkg.com/{% if ansible_os_family == 'RedHat' %}rpm{% else %}debian{% endif %}/pubkey.gpg"
Expand Down
4 changes: 2 additions & 2 deletions roles/install/tasks/firewalld.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
notify: Reload journald configuration

- include_role:
name: bviktor.firewalld
name: noobient.firewalld
vars:
service: kf2
port: "{{ item }}"
Expand All @@ -51,7 +51,7 @@
- 8080/tcp

- include_role:
name: bviktor.logrotate
name: noobient.logrotate
vars:
name: firewalld-denied
pattern: |-
Expand Down
4 changes: 2 additions & 2 deletions roles/install/tasks/kf2-classic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
when: ansible_os_family == 'RedHat'

- include_role:
name: bviktor.thirdparty
name: noobient.thirdparty
vars:
name: '.NET Runtime'
gpg_url: 'https://packages.microsoft.com/keys/microsoft.asc'
Expand All @@ -15,7 +15,7 @@
when: ansible_os_family == 'Debian'

- include_role:
name: bviktor.github_release
name: noobient.github_release
vars:
owner: 'SteamRE'
repo: 'DepotDownloader'
Expand Down
2 changes: 1 addition & 1 deletion roles/install/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
- include_tasks: user.yml

- include_role:
name: bviktor.selinux_cil
name: noobient.selinux_cil
vars:
module: killinuxfloor

Expand Down
2 changes: 1 addition & 1 deletion roles/install/tasks/os.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# Here we check not only the KF2 service, but also systemd state
# Used in e.g. init, config, systemd
- include_role:
name: bviktor.servicecheck
name: noobient.servicecheck
vars:
unit: kf2.service

Expand Down
2 changes: 1 addition & 1 deletion roles/uninstall/tasks/firewalld.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
- include_role:
name: bviktor.firewalld
name: noobient.firewalld
vars:
service: 'kf2'
enabled: false
Expand Down
6 changes: 3 additions & 3 deletions roles/uninstall/tasks/systemd.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
- include_role:
name: bviktor.servicecheck
name: noobient.servicecheck
vars:
unit: kf2.service

Expand All @@ -12,7 +12,7 @@
when: servicecheck.exists

- include_role:
name: bviktor.servicecheck
name: noobient.servicecheck
vars:
unit: kf2autokick.service

Expand All @@ -24,7 +24,7 @@
when: servicecheck.exists

- include_role:
name: bviktor.servicecheck
name: noobient.servicecheck
vars:
unit: kf2watchdog.service

Expand Down
2 changes: 1 addition & 1 deletion test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -u

if [ $# -lt 1 ]
then
platform="fedora:37"
platform="fedora:39"
else
platform="${1}"
fi
Expand Down

0 comments on commit 606770f

Please sign in to comment.