From 8cad395e346f3ba2c4956ebb9aa7cb33719eeb44 Mon Sep 17 00:00:00 2001 From: = <=> Date: Fri, 4 Apr 2025 23:41:35 -0400 Subject: [PATCH] aur repo host secret lookup --- .../aur_repo_hosts/aur_repo_host.yml | 27 ++++++++++- .../dev.balsillie.house/aur_repo_host.yaml | 46 ------------------- ansible/roles/aur_repo_host/tasks/main.yaml | 10 ++++ 3 files changed, 36 insertions(+), 47 deletions(-) delete mode 100644 ansible/inventory/host_vars/dev.balsillie.house/aur_repo_host.yaml diff --git a/ansible/inventory/group_vars/aur_repo_hosts/aur_repo_host.yml b/ansible/inventory/group_vars/aur_repo_hosts/aur_repo_host.yml index 2c5b24a..00380e2 100644 --- a/ansible/inventory/group_vars/aur_repo_hosts/aur_repo_host.yml +++ b/ansible/inventory/group_vars/aur_repo_hosts/aur_repo_host.yml @@ -1 +1,26 @@ -# code: language=ansible \ No newline at end of file +# code: language=ansible + +aur_repo_packager_name: "Balsillie Family" +aur_repo_packager_email: "admin@balsillie.net" +aur_repo_dir: "/aur" + +aur_repo_build_account: "aur-builder" + +aur_repo_host_packages: + - pikaur + - jellyfin-media-player + - git-credential-keepassxc + - docker-credential-secretservice-bin + - ventoy-bin + - debtap + - aurutils + - ipmiview + - protonvpn + - protonmail-bridge + - powershell-bin + - azure-cli-bin + - visual-studio-code-bin + - ttf-ms-fonts + - brave-bin + - teamviewer + - vmware-horizon-client diff --git a/ansible/inventory/host_vars/dev.balsillie.house/aur_repo_host.yaml b/ansible/inventory/host_vars/dev.balsillie.house/aur_repo_host.yaml deleted file mode 100644 index f7ead3f..0000000 --- a/ansible/inventory/host_vars/dev.balsillie.house/aur_repo_host.yaml +++ /dev/null @@ -1,46 +0,0 @@ -# code: language=ansible - -aur_repo_packager_name: "Balsillie Family" -aur_repo_packager_email: "admin@balsillie.net" -aur_repo_dir: "/aur" - -aur_repo_build_account: "aur-builder" - -aur_repo_host_packages: - # - kodi-addon-game-libretro-desmume # Nintendo DS - # - kodi-addon-game-libretro-gambatte # Gameboy / Gameboy Colour - # - kodi-addon-game-libretro-mgba # Gameboy Advance - # - kodi-addon-game-libretro-nestopia # Nintendo - # - kodi-addon-game-libretro-scummvm # ScummVM - # - kodi-addon-game-libretro-snes9x # Super Nintendo - # - kodi-addon-game-libretro-parallel-n64 # Nintendo 64 - # - kodi-addon-vfs-sftp - # - kodi-standalone-service - # - proton-ge-custom-bin - - pikaur - # - sonarr - # - radarr - # - lidarr - # - prowlarr - # - bazarr - - jellyfin-media-player - # - moonlight-qt-bin - - git-credential-keepassxc - - docker-credential-secretservice-bin - # - obs-backgroundremoval - - ventoy-bin - - debtap - - aurutils - # - kdocker - - ipmiview - - protonvpn - - protonmail-bridge - - powershell-bin - - azure-cli-bin - # - microsoft-edge-stable-bin - # - teams-for-linux-bin - - visual-studio-code-bin - - ttf-ms-fonts - - brave-bin - - teamviewer - - vmware-horizon-client diff --git a/ansible/roles/aur_repo_host/tasks/main.yaml b/ansible/roles/aur_repo_host/tasks/main.yaml index 2ace296..410a7e6 100644 --- a/ansible/roles/aur_repo_host/tasks/main.yaml +++ b/ansible/roles/aur_repo_host/tasks/main.yaml @@ -1,5 +1,15 @@ --- +- name: Lookup aur_repo_host secret + community.hashi_vault.vault_kv1_get: + path: ansible/group_vars/aur_repo_hosts + register: aur_repo_host_secret + +- name: Set aur_repo facts + ansible.builtin.set_fact: + aur_repo_private_key: "{{ aur_repo_host_secret.secret.aur_repo_private_key }}" + aur_repo_key_thumbprint: "{{ aur_repo_host_secret.secret.aur_repo_key_thumbprint }}" + - name: Create the makepkg drop-in config file ansible.builtin.template: dest: /etc/makepkg.conf.d/makepkg.conf