From fa076daf9eba195e9ad997c93c8766ed2d336d98 Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Thu, 20 Jun 2024 23:49:47 +0100 Subject: [PATCH] Install OpenVPN3 --- lumina/scripts/_base/003-ptyxis-terminal.sh | 2 +- lumina/scripts/_base/004-vscode.sh | 2 +- lumina/scripts/_base/006-docker.sh | 2 +- lumina/scripts/_base/007-install-development-tools.sh | 2 +- lumina/scripts/_base/010-install-1password.sh | 4 ++-- lumina/scripts/_base/014-openvpn.sh | 10 ++++++++++ 6 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 lumina/scripts/_base/014-openvpn.sh diff --git a/lumina/scripts/_base/003-ptyxis-terminal.sh b/lumina/scripts/_base/003-ptyxis-terminal.sh index 696d3d0..629413d 100644 --- a/lumina/scripts/_base/003-ptyxis-terminal.sh +++ b/lumina/scripts/_base/003-ptyxis-terminal.sh @@ -24,4 +24,4 @@ fi rpm-ostree install ptyxis -rm -rf /etc/yum.repos.d/_copr_ublue-os_staging.repo +rm /etc/yum.repos.d/_copr_ublue-os_staging.repo diff --git a/lumina/scripts/_base/004-vscode.sh b/lumina/scripts/_base/004-vscode.sh index 7f25d35..1c31fca 100644 --- a/lumina/scripts/_base/004-vscode.sh +++ b/lumina/scripts/_base/004-vscode.sh @@ -14,4 +14,4 @@ EOF rpm-ostree install code -rm -f /etc/yum.repos.d/vscode.repo +rm /etc/yum.repos.d/vscode.repo diff --git a/lumina/scripts/_base/006-docker.sh b/lumina/scripts/_base/006-docker.sh index 8cba8a3..9360e6f 100644 --- a/lumina/scripts/_base/006-docker.sh +++ b/lumina/scripts/_base/006-docker.sh @@ -21,4 +21,4 @@ rpm-ostree install \ systemctl enable docker.socket -rm -f /etc/yum.repos.d/docker-ce.repo +rm /etc/yum.repos.d/docker-ce.repo diff --git a/lumina/scripts/_base/007-install-development-tools.sh b/lumina/scripts/_base/007-install-development-tools.sh index 3379476..6533b7b 100644 --- a/lumina/scripts/_base/007-install-development-tools.sh +++ b/lumina/scripts/_base/007-install-development-tools.sh @@ -18,4 +18,4 @@ install -c -m 0755 /tmp/devbox /usr/bin/devbox rpm-ostree install \ gh zstd -rm -f /etc/yum.repos.d/github.repo +rm /etc/yum.repos.d/github.repo diff --git a/lumina/scripts/_base/010-install-1password.sh b/lumina/scripts/_base/010-install-1password.sh index 15e5eb6..1e01523 100644 --- a/lumina/scripts/_base/010-install-1password.sh +++ b/lumina/scripts/_base/010-install-1password.sh @@ -93,8 +93,8 @@ EOF # remove the sysusers.d entries created by onepassword RPMs. # They don't magically set the GID like we need them to. -rm -f /usr/lib/sysusers.d/30-rpmostree-pkg-group-onepassword.conf -rm -f /usr/lib/sysusers.d/30-rpmostree-pkg-group-onepassword-cli.conf +rm /usr/lib/sysusers.d/30-rpmostree-pkg-group-onepassword.conf +rm /usr/lib/sysusers.d/30-rpmostree-pkg-group-onepassword-cli.conf # Register path symlink # We do this via tmpfiles.d so that it is created by the live system. diff --git a/lumina/scripts/_base/014-openvpn.sh b/lumina/scripts/_base/014-openvpn.sh new file mode 100644 index 0000000..0bc1929 --- /dev/null +++ b/lumina/scripts/_base/014-openvpn.sh @@ -0,0 +1,10 @@ +#!/usr/bin/bash + +set -euox pipefail + +wget https://copr.fedorainfracloud.org/coprs/dsommers/openvpn3/repo/fedora-$(rpm -E %fedora)/dsommers-openvpn3-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/openvpn3.repo + +rpm-ostree install \ + openvpn3-client + +rm /etc/yum.repos.d/openvpn3.repo