From 81b01bd7ce336c67b08f04d7af36e6897bb169c5 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Thu, 16 Nov 2023 23:29:43 +0100 Subject: [PATCH] Cleaned up and refactored --- README.md | 11 +---------- playbook.yml | 14 +++++++------- roles/{git-client => client-git}/tasks/main.yml | 0 .../tasks/main.yml | 0 .../vars/main.yml | 0 roles/client-ssh/Readme.md | 2 ++ .../{application-ssh => client-ssh}/meta/main.yml | 2 +- .../{application-ssh => client-ssh}/tasks/main.yml | 0 .../README.md | 0 .../client-wireguard-behind-firewall/meta/main.yml | 2 ++ .../tasks/main.yml | 0 .../README.md | 0 .../files/set-mtu.service | 0 .../handlers/main.yml | 0 roles/client-wireguard/meta/main.yml | 2 ++ .../tasks/main.yml | 0 .../templates/set-mtu.sh.j2 | 0 .../meta/main.yml | 2 -- roles/client_application-wireguard/meta/main.yml | 2 -- roles/collection-administrator-base/meta/main.yml | 2 +- roles/collection-office/meta/main.yml | 2 +- .../README.md | 0 .../meta/main.yml | 0 .../tasks/main.yml | 0 .../templates/caffeine.desktop.j2 | 0 .../vars/main.yml | 0 roles/{system-gnome => desktop-gnome}/Readme.md | 2 +- roles/desktop-gnome/meta/main.yml | 3 +++ .../{system-gnome => desktop-gnome}/tasks/main.yml | 0 .../meta/main.yml | 0 .../tasks/main.yml | 0 .../tasks/main.yml | 0 .../Readme.md | 2 +- roles/system-gnome/meta/main.yml | 3 --- roles/system-swapfile/meta/main.yml | 2 +- .../{application-wireguard => wireguard}/README.md | 0 .../files/wireguard-ip.conf | 2 +- .../handlers/main.yml | 0 .../tasks/main.yml | 0 39 files changed, 24 insertions(+), 31 deletions(-) rename roles/{git-client => client-git}/tasks/main.yml (100%) rename roles/{application-nextcloud => client-nextcloud}/tasks/main.yml (100%) rename roles/{application-nextcloud => client-nextcloud}/vars/main.yml (100%) create mode 100644 roles/client-ssh/Readme.md rename roles/{application-ssh => client-ssh}/meta/main.yml (53%) rename roles/{application-ssh => client-ssh}/tasks/main.yml (100%) rename roles/{client_application-wireguard-behind-firewall => client-wireguard-behind-firewall}/README.md (100%) create mode 100644 roles/client-wireguard-behind-firewall/meta/main.yml rename roles/{client_application-wireguard-behind-firewall => client-wireguard-behind-firewall}/tasks/main.yml (100%) rename roles/{client_application-wireguard => client-wireguard}/README.md (100%) rename roles/{client_application-wireguard => client-wireguard}/files/set-mtu.service (100%) rename roles/{client_application-wireguard => client-wireguard}/handlers/main.yml (100%) create mode 100644 roles/client-wireguard/meta/main.yml rename roles/{client_application-wireguard => client-wireguard}/tasks/main.yml (100%) rename roles/{client_application-wireguard => client-wireguard}/templates/set-mtu.sh.j2 (100%) delete mode 100644 roles/client_application-wireguard-behind-firewall/meta/main.yml delete mode 100644 roles/client_application-wireguard/meta/main.yml rename roles/{application-caffeine => desktop-caffeine}/README.md (100%) rename roles/{application-caffeine => desktop-caffeine}/meta/main.yml (100%) rename roles/{application-caffeine => desktop-caffeine}/tasks/main.yml (100%) rename roles/{application-caffeine => desktop-caffeine}/templates/caffeine.desktop.j2 (100%) rename roles/{application-caffeine => desktop-caffeine}/vars/main.yml (100%) rename roles/{system-gnome => desktop-gnome}/Readme.md (89%) create mode 100644 roles/desktop-gnome/meta/main.yml rename roles/{system-gnome => desktop-gnome}/tasks/main.yml (100%) rename roles/{application-libreoffice => desktop-libreoffice}/meta/main.yml (100%) rename roles/{application-libreoffice => desktop-libreoffice}/tasks/main.yml (100%) rename roles/{application-torbrowser => desktop-torbrowser}/tasks/main.yml (100%) rename roles/{application-virtual-box => desktop-virtual-box}/Readme.md (93%) delete mode 100644 roles/system-gnome/meta/main.yml rename roles/{application-wireguard => wireguard}/README.md (100%) rename roles/{application-wireguard => wireguard}/files/wireguard-ip.conf (89%) rename roles/{application-wireguard => wireguard}/handlers/main.yml (100%) rename roles/{application-wireguard => wireguard}/tasks/main.yml (100%) diff --git a/README.md b/README.md index c5302b5f..b4d8f009 100644 --- a/README.md +++ b/README.md @@ -92,13 +92,4 @@ Kevin Veen-Birkenbach ## License -This project is licensed under the GNU Affero General Public License v3.0. The full license text is available in the `LICENSE` file of this repository. - -## todo -- implement: https://archlinux.org/packages/extra/x86_64/signal-desktop/ - -## See -- https://www.middlewareinventory.com/blog/run-ansible-playbook-locally/ -- https://stackoverflow.com/questions/30533372/run-an-ansible-task-only-when-the-hostname-contains-a-string -- https://archived.forum.manjaro.org/t/running-android-applications-on-arch-using-anbox/53332 -- https://www.reddit.com/r/ManjaroLinux/comments/cbkblb/guide_run_android_apps_on_manjaro_super_simple/ +This project is licensed under the GNU Affero General Public License v3.0. The full license text is available in the `LICENSE` file of this repository. diff --git a/playbook.yml b/playbook.yml index cb8c33e0..fb1b799f 100644 --- a/playbook.yml +++ b/playbook.yml @@ -20,19 +20,19 @@ hosts: wireguard_server become: true roles: - - application-wireguard + - wireguard - name: setup wireguard client behind firewall\nat hosts: wireguard_behind_firewall become: true roles: - - client_application-wireguard-behind-firewall + - client-wireguard-behind-firewall - name: setup wireguard client hosts: wireguard_client become: true roles: - - client_application-wireguard + - client-wireguard # Native Webserver Roles - name: setup homepages @@ -260,7 +260,7 @@ hosts: gnome become: true roles: - - system-gnome + - desktop-gnome - name: setup msi rgb keyboard hosts: msi_perkeyrgb @@ -272,7 +272,7 @@ hosts: ssh become: false roles: - - application-ssh + - client-ssh - name: setup swapfile hosts hosts: swapfile @@ -302,13 +302,13 @@ hosts: torbrowser become: true roles: - - application-torbrowser + - desktop-torbrowser - name: setup nextcloud hosts: nextcloud_client become: true roles: - - application-nextcloud + - client-nextcloud - name: setup docker hosts: docker diff --git a/roles/git-client/tasks/main.yml b/roles/client-git/tasks/main.yml similarity index 100% rename from roles/git-client/tasks/main.yml rename to roles/client-git/tasks/main.yml diff --git a/roles/application-nextcloud/tasks/main.yml b/roles/client-nextcloud/tasks/main.yml similarity index 100% rename from roles/application-nextcloud/tasks/main.yml rename to roles/client-nextcloud/tasks/main.yml diff --git a/roles/application-nextcloud/vars/main.yml b/roles/client-nextcloud/vars/main.yml similarity index 100% rename from roles/application-nextcloud/vars/main.yml rename to roles/client-nextcloud/vars/main.yml diff --git a/roles/client-ssh/Readme.md b/roles/client-ssh/Readme.md new file mode 100644 index 00000000..f7ecef99 --- /dev/null +++ b/roles/client-ssh/Readme.md @@ -0,0 +1,2 @@ +# Client SSH +Setups SSH on the client side \ No newline at end of file diff --git a/roles/application-ssh/meta/main.yml b/roles/client-ssh/meta/main.yml similarity index 53% rename from roles/application-ssh/meta/main.yml rename to roles/client-ssh/meta/main.yml index 7caed099..758451c9 100644 --- a/roles/application-ssh/meta/main.yml +++ b/roles/client-ssh/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- git-client \ No newline at end of file +- client-git \ No newline at end of file diff --git a/roles/application-ssh/tasks/main.yml b/roles/client-ssh/tasks/main.yml similarity index 100% rename from roles/application-ssh/tasks/main.yml rename to roles/client-ssh/tasks/main.yml diff --git a/roles/client_application-wireguard-behind-firewall/README.md b/roles/client-wireguard-behind-firewall/README.md similarity index 100% rename from roles/client_application-wireguard-behind-firewall/README.md rename to roles/client-wireguard-behind-firewall/README.md diff --git a/roles/client-wireguard-behind-firewall/meta/main.yml b/roles/client-wireguard-behind-firewall/meta/main.yml new file mode 100644 index 00000000..66d04ca3 --- /dev/null +++ b/roles/client-wireguard-behind-firewall/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: +- client-wireguard diff --git a/roles/client_application-wireguard-behind-firewall/tasks/main.yml b/roles/client-wireguard-behind-firewall/tasks/main.yml similarity index 100% rename from roles/client_application-wireguard-behind-firewall/tasks/main.yml rename to roles/client-wireguard-behind-firewall/tasks/main.yml diff --git a/roles/client_application-wireguard/README.md b/roles/client-wireguard/README.md similarity index 100% rename from roles/client_application-wireguard/README.md rename to roles/client-wireguard/README.md diff --git a/roles/client_application-wireguard/files/set-mtu.service b/roles/client-wireguard/files/set-mtu.service similarity index 100% rename from roles/client_application-wireguard/files/set-mtu.service rename to roles/client-wireguard/files/set-mtu.service diff --git a/roles/client_application-wireguard/handlers/main.yml b/roles/client-wireguard/handlers/main.yml similarity index 100% rename from roles/client_application-wireguard/handlers/main.yml rename to roles/client-wireguard/handlers/main.yml diff --git a/roles/client-wireguard/meta/main.yml b/roles/client-wireguard/meta/main.yml new file mode 100644 index 00000000..4350a73a --- /dev/null +++ b/roles/client-wireguard/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: +- wireguard \ No newline at end of file diff --git a/roles/client_application-wireguard/tasks/main.yml b/roles/client-wireguard/tasks/main.yml similarity index 100% rename from roles/client_application-wireguard/tasks/main.yml rename to roles/client-wireguard/tasks/main.yml diff --git a/roles/client_application-wireguard/templates/set-mtu.sh.j2 b/roles/client-wireguard/templates/set-mtu.sh.j2 similarity index 100% rename from roles/client_application-wireguard/templates/set-mtu.sh.j2 rename to roles/client-wireguard/templates/set-mtu.sh.j2 diff --git a/roles/client_application-wireguard-behind-firewall/meta/main.yml b/roles/client_application-wireguard-behind-firewall/meta/main.yml deleted file mode 100644 index ceb632fc..00000000 --- a/roles/client_application-wireguard-behind-firewall/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: -- client_application-wireguard diff --git a/roles/client_application-wireguard/meta/main.yml b/roles/client_application-wireguard/meta/main.yml deleted file mode 100644 index ec446b54..00000000 --- a/roles/client_application-wireguard/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: -- application-wireguard \ No newline at end of file diff --git a/roles/collection-administrator-base/meta/main.yml b/roles/collection-administrator-base/meta/main.yml index 7caed099..758451c9 100644 --- a/roles/collection-administrator-base/meta/main.yml +++ b/roles/collection-administrator-base/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- git-client \ No newline at end of file +- client-git \ No newline at end of file diff --git a/roles/collection-office/meta/main.yml b/roles/collection-office/meta/main.yml index c67973f1..f505ce23 100644 --- a/roles/collection-office/meta/main.yml +++ b/roles/collection-office/meta/main.yml @@ -1,3 +1,3 @@ dependencies: -- application-libreoffice +- desktop-libreoffice - collection-video-conference \ No newline at end of file diff --git a/roles/application-caffeine/README.md b/roles/desktop-caffeine/README.md similarity index 100% rename from roles/application-caffeine/README.md rename to roles/desktop-caffeine/README.md diff --git a/roles/application-caffeine/meta/main.yml b/roles/desktop-caffeine/meta/main.yml similarity index 100% rename from roles/application-caffeine/meta/main.yml rename to roles/desktop-caffeine/meta/main.yml diff --git a/roles/application-caffeine/tasks/main.yml b/roles/desktop-caffeine/tasks/main.yml similarity index 100% rename from roles/application-caffeine/tasks/main.yml rename to roles/desktop-caffeine/tasks/main.yml diff --git a/roles/application-caffeine/templates/caffeine.desktop.j2 b/roles/desktop-caffeine/templates/caffeine.desktop.j2 similarity index 100% rename from roles/application-caffeine/templates/caffeine.desktop.j2 rename to roles/desktop-caffeine/templates/caffeine.desktop.j2 diff --git a/roles/application-caffeine/vars/main.yml b/roles/desktop-caffeine/vars/main.yml similarity index 100% rename from roles/application-caffeine/vars/main.yml rename to roles/desktop-caffeine/vars/main.yml diff --git a/roles/system-gnome/Readme.md b/roles/desktop-gnome/Readme.md similarity index 89% rename from roles/system-gnome/Readme.md rename to roles/desktop-gnome/Readme.md index 8ade9fc6..54299a7c 100644 --- a/roles/system-gnome/Readme.md +++ b/roles/desktop-gnome/Readme.md @@ -1,3 +1,3 @@ -# system-gnome +# desktop-gnome ## further information - https://askubuntu.com/questions/1029376/how-do-i-enable-and-disable-gnome-extensions-from-the-command-line \ No newline at end of file diff --git a/roles/desktop-gnome/meta/main.yml b/roles/desktop-gnome/meta/main.yml new file mode 100644 index 00000000..ea59cdff --- /dev/null +++ b/roles/desktop-gnome/meta/main.yml @@ -0,0 +1,3 @@ +dependencies: +- client-git +- desktop-caffeine \ No newline at end of file diff --git a/roles/system-gnome/tasks/main.yml b/roles/desktop-gnome/tasks/main.yml similarity index 100% rename from roles/system-gnome/tasks/main.yml rename to roles/desktop-gnome/tasks/main.yml diff --git a/roles/application-libreoffice/meta/main.yml b/roles/desktop-libreoffice/meta/main.yml similarity index 100% rename from roles/application-libreoffice/meta/main.yml rename to roles/desktop-libreoffice/meta/main.yml diff --git a/roles/application-libreoffice/tasks/main.yml b/roles/desktop-libreoffice/tasks/main.yml similarity index 100% rename from roles/application-libreoffice/tasks/main.yml rename to roles/desktop-libreoffice/tasks/main.yml diff --git a/roles/application-torbrowser/tasks/main.yml b/roles/desktop-torbrowser/tasks/main.yml similarity index 100% rename from roles/application-torbrowser/tasks/main.yml rename to roles/desktop-torbrowser/tasks/main.yml diff --git a/roles/application-virtual-box/Readme.md b/roles/desktop-virtual-box/Readme.md similarity index 93% rename from roles/application-virtual-box/Readme.md rename to roles/desktop-virtual-box/Readme.md index 343eba11..2e88e6c7 100644 --- a/roles/application-virtual-box/Readme.md +++ b/roles/desktop-virtual-box/Readme.md @@ -1,4 +1,4 @@ -# application-virtual-box +# desktop-virtual-box ```bash sudo pacman -S virtualbox "$(pacman -Qsq "^linux" | grep "^linux[0-9]*[-rt]*$" | awk '{print $1"-virtualbox-host-modules"}' ORS=' ')" && diff --git a/roles/system-gnome/meta/main.yml b/roles/system-gnome/meta/main.yml deleted file mode 100644 index 8a7e804e..00000000 --- a/roles/system-gnome/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ -dependencies: -- git-client -- application-caffeine \ No newline at end of file diff --git a/roles/system-swapfile/meta/main.yml b/roles/system-swapfile/meta/main.yml index 7caed099..758451c9 100644 --- a/roles/system-swapfile/meta/main.yml +++ b/roles/system-swapfile/meta/main.yml @@ -1,2 +1,2 @@ dependencies: -- git-client \ No newline at end of file +- client-git \ No newline at end of file diff --git a/roles/application-wireguard/README.md b/roles/wireguard/README.md similarity index 100% rename from roles/application-wireguard/README.md rename to roles/wireguard/README.md diff --git a/roles/application-wireguard/files/wireguard-ip.conf b/roles/wireguard/files/wireguard-ip.conf similarity index 89% rename from roles/application-wireguard/files/wireguard-ip.conf rename to roles/wireguard/files/wireguard-ip.conf index 23a8cce2..9f88c722 100644 --- a/roles/application-wireguard/files/wireguard-ip.conf +++ b/roles/wireguard/files/wireguard-ip.conf @@ -1,5 +1,5 @@ # This file is created by -# https://github.com/kevinveenbirkenbach/computer-playbook/tree/main/roles/application-wireguard +# https://github.com/kevinveenbirkenbach/computer-playbook/tree/main/roles/wireguard net.ipv6.conf.all.disable_ipv6 = 0 net.ipv6.conf.default.disable_ipv6 = 0 diff --git a/roles/application-wireguard/handlers/main.yml b/roles/wireguard/handlers/main.yml similarity index 100% rename from roles/application-wireguard/handlers/main.yml rename to roles/wireguard/handlers/main.yml diff --git a/roles/application-wireguard/tasks/main.yml b/roles/wireguard/tasks/main.yml similarity index 100% rename from roles/application-wireguard/tasks/main.yml rename to roles/wireguard/tasks/main.yml