From 10ac4091e61c3d078fed0e03c5e339e5f8a588d8 Mon Sep 17 00:00:00 2001 From: Menno van Leeuwen Date: Tue, 11 Mar 2025 21:11:35 +0100 Subject: [PATCH] refactor: restructure Ansible tasks for server and workstation setup for improved organization --- config/ansible/tasks/servers/server.yml | 34 +++---- .../services/golink/docker-compose.yml.j2 | 2 +- .../tasks/workstations/workstation.yml | 96 ++++++++++--------- 3 files changed, 68 insertions(+), 64 deletions(-) diff --git a/config/ansible/tasks/servers/server.yml b/config/ansible/tasks/servers/server.yml index 301c63f..d143d75 100644 --- a/config/ansible/tasks/servers/server.yml +++ b/config/ansible/tasks/servers/server.yml @@ -1,18 +1,20 @@ -- name: Ensure server common packages are installed - ansible.builtin.package: - name: - - openssh-server - state: present - become: true +- name: Server setup + block: + - name: Ensure server common packages are installed + ansible.builtin.package: + name: + - openssh-server + state: present + become: true -- name: Include cifs tasks - ansible.builtin.include_tasks: cifs.yml - when: ansible_hostname == "mennos-cloud-server" + - name: Include cifs tasks + ansible.builtin.include_tasks: cifs.yml + when: ansible_hostname == "mennos-cloud-server" -- name: Include services tasks - ansible.builtin.include_tasks: services/services.yml - vars: - hoarder_enabled: true - golink_enabled: true - immich_enabled: false - when: ansible_hostname == "mennos-cloud-server" + - name: Include services tasks + ansible.builtin.include_tasks: services/services.yml + vars: + hoarder_enabled: true + golink_enabled: true + immich_enabled: false + when: ansible_hostname == "mennos-cloud-server" diff --git a/config/ansible/tasks/servers/services/golink/docker-compose.yml.j2 b/config/ansible/tasks/servers/services/golink/docker-compose.yml.j2 index 5e05d5d..7ffcb71 100644 --- a/config/ansible/tasks/servers/services/golink/docker-compose.yml.j2 +++ b/config/ansible/tasks/servers/services/golink/docker-compose.yml.j2 @@ -4,7 +4,7 @@ services: image: ghcr.io/tailscale/golink:main user: root environment: - - TS_AUTHKEY={{ lookup('onepassword', "op://j7nmhqlsjmp2r6umly5t75hzb4/GoLink/TS_AUTHKEY") }} + - TS_AUTHKEY={{ lookup('onepassword', 'op://j7nmhqlsjmp2r6umly5t75hzb4/GoLink/TS_AUTHKEY') }} volumes: - {{ golink_data_dir }}:/home/nonroot restart: "unless-stopped" diff --git a/config/ansible/tasks/workstations/workstation.yml b/config/ansible/tasks/workstations/workstation.yml index 239a507..60bb624 100644 --- a/config/ansible/tasks/workstations/workstation.yml +++ b/config/ansible/tasks/workstations/workstation.yml @@ -1,57 +1,59 @@ -- name: Include workstation symlinks tasks - ansible.builtin.import_tasks: tasks/workstations/symlinks.yml +- name: Workstation Setup + block: + - name: Include workstation symlinks tasks + ansible.builtin.import_tasks: tasks/workstations/symlinks.yml -- name: Include GNOME Extensions tasks - ansible.builtin.import_tasks: tasks/workstations/gnome-extensions.yml + - name: Include GNOME Extensions tasks + ansible.builtin.import_tasks: tasks/workstations/gnome-extensions.yml -- name: Include flatpaks tasks - ansible.builtin.import_tasks: tasks/workstations/flatpaks.yml + - name: Include flatpaks tasks + ansible.builtin.import_tasks: tasks/workstations/flatpaks.yml -- name: Include snaps tasks - ansible.builtin.import_tasks: tasks/workstations/snaps.yml + - name: Include snaps tasks + ansible.builtin.import_tasks: tasks/workstations/snaps.yml -- name: Include VSCode tasks - ansible.builtin.import_tasks: tasks/workstations/vscode.yml - become: true + - name: Include VSCode tasks + ansible.builtin.import_tasks: tasks/workstations/vscode.yml + become: true -- name: Include Zen browser tasks - ansible.builtin.import_tasks: tasks/workstations/zen-browser.yml - vars: - browser_name: "zen" - browser_executable: "zen" + - name: Include Zen browser tasks + ansible.builtin.import_tasks: tasks/workstations/zen-browser.yml + vars: + browser_name: "zen" + browser_executable: "zen" -- name: Include 1Password Zen Browser tasks - ansible.builtin.import_tasks: tasks/workstations/1password-zen-browser.yml + - name: Include 1Password Zen Browser tasks + ansible.builtin.import_tasks: tasks/workstations/1password-zen-browser.yml -- name: Include Firefox PWA tasks - ansible.builtin.import_tasks: tasks/workstations/firefoxpwa.yml + - name: Include Firefox PWA tasks + ansible.builtin.import_tasks: tasks/workstations/firefoxpwa.yml -- name: Include Ulauncher tasks - ansible.builtin.import_tasks: tasks/workstations/ulauncher.yml + - name: Include Ulauncher tasks + ansible.builtin.import_tasks: tasks/workstations/ulauncher.yml -- name: Include MegaSync tasks - ansible.builtin.import_tasks: tasks/workstations/megasync.yml + - name: Include MegaSync tasks + ansible.builtin.import_tasks: tasks/workstations/megasync.yml -- name: Ensure workstation common packages are installed - ansible.builtin.package: - name: - ###### THE FOLLOWING PACKAGES ARE DISABLED DUE TO MISSING ON UBUNTU REPOS ###### - # Steam and it's dependencies - # - steam - # - steam-devices - ################################################################################ - # Statistics HUD for gaming - - mangohud - # Used for VSCode Extensions - - nodejs - # File Manager - - nemo - # File Manager Extensions - - nemo-compare - - nemo-data - - nemo-fileroller - - nemo-font-manager - - nemo-gtkhash - - nemo-python - state: present - become: true + - name: Ensure workstation common packages are installed + ansible.builtin.package: + name: + ###### THE FOLLOWING PACKAGES ARE DISABLED DUE TO MISSING ON UBUNTU REPOS ###### + # Steam and it's dependencies + # - steam + # - steam-devices + ################################################################################ + # Statistics HUD for gaming + - mangohud + # Used for VSCode Extensions + - nodejs + # File Manager + - nemo + # File Manager Extensions + - nemo-compare + - nemo-data + - nemo-fileroller + - nemo-font-manager + - nemo-gtkhash + - nemo-python + state: present + become: true