From 1a1bcc0531966e11401c7976b7b3bc3fc7fcbc7e Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sat, 4 Jan 2025 22:35:37 -0600 Subject: [PATCH 01/14] Combine ansible packages Co-authored-by: madomado --- catalogue/administration.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/catalogue/administration.yml b/catalogue/administration.yml index 66c731c..b8a6150 100644 --- a/catalogue/administration.yml +++ b/catalogue/administration.yml @@ -31,12 +31,7 @@ choices: Automate everything from code deployment to network configuration to cloud management, in a language that approaches plain English, using SSH, with no agents to install on remote systems. Ultramarine also include commonly used ansible collections. - actions: - - rpm:ansible - - rpm:ansible-collection-ansible-netcommon - - rpm:ansible-collection-ansible-utils - - rpm:ansible-collection-ansible-posix - - rpm:ansible-collection-ansible-windows + actions: rpm:ansible;rpm:ansible-collection-ansible-netcommon;rpm:ansible-collection-ansible-utils;rpm:ansible-collection-ansible-posix;rpm:ansible-collection-ansible-windows - name: docker provider: Docker From bac11605563d28959747a8b61a3f173f57d023fa Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sat, 4 Jan 2025 22:36:26 -0600 Subject: [PATCH 02/14] fix red hat grammer --- catalogue/administration.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/catalogue/administration.yml b/catalogue/administration.yml index b8a6150..a8cfcae 100644 --- a/catalogue/administration.yml +++ b/catalogue/administration.yml @@ -25,7 +25,7 @@ choices: # todo: Ktailctl and Tailscale Status extension, don't know how to have desktop specific functions here - name: ansible - provider: Red HAt + provider: Red Hat description: | Ansible is a radically simple IT automation platform that makes your applications and systems easier to deploy and maintain. Automate everything from code deployment to network configuration to cloud management, @@ -46,4 +46,4 @@ choices: - rpm:docker-ce-cli - rpm:containerd.io - rpm:docker-buildx-plugin - - rpm:docker-compose-plugin \ No newline at end of file + - rpm:docker-compose-plugin From 77f59f4ad3b704ff649a19d892843c18f5fa4e8e Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sat, 4 Jan 2025 22:36:57 -0600 Subject: [PATCH 03/14] Capitalize Ansible Co-authored-by: madomado --- catalogue/administration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalogue/administration.yml b/catalogue/administration.yml index a8cfcae..1742d69 100644 --- a/catalogue/administration.yml +++ b/catalogue/administration.yml @@ -24,7 +24,7 @@ choices: state: started # todo: Ktailctl and Tailscale Status extension, don't know how to have desktop specific functions here - - name: ansible + - name: Ansible provider: Red Hat description: | Ansible is a radically simple IT automation platform that makes your applications and systems easier to deploy and maintain. From af11bee8bb990c0c8d7260f23343535392e7aa9f Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sat, 4 Jan 2025 22:37:14 -0600 Subject: [PATCH 04/14] Capitalize Docker Co-authored-by: madomado --- catalogue/administration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalogue/administration.yml b/catalogue/administration.yml index 1742d69..c355bd4 100644 --- a/catalogue/administration.yml +++ b/catalogue/administration.yml @@ -33,7 +33,7 @@ choices: Ultramarine also include commonly used ansible collections. actions: rpm:ansible;rpm:ansible-collection-ansible-netcommon;rpm:ansible-collection-ansible-utils;rpm:ansible-collection-ansible-posix;rpm:ansible-collection-ansible-windows - - name: docker + - name: Docker provider: Docker description: | Software that uses virtualization to create and manage containers. From 22566be49abde6c2562df9af94e0fab45c0baf90 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sat, 4 Jan 2025 22:39:02 -0600 Subject: [PATCH 05/14] Capitalize Tailscale Co-authored-by: madomado --- catalogue/administration.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/catalogue/administration.yml b/catalogue/administration.yml index c355bd4..da052cf 100644 --- a/catalogue/administration.yml +++ b/catalogue/administration.yml @@ -12,8 +12,8 @@ choices: Desktop tool for managing virtual machines via libvirt. actions: rpm:virt-manager - - name: tailscale - provider: tailscale + - name: Tailscale + provider: Tailscale description: | actions: - enable_yum_repo:https://pkgs.tailscale.com/stable/fedora/tailscale.repo From 8483b745eed339aa9a8ef8e9fa6661063536f32a Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sat, 4 Jan 2025 22:48:26 -0600 Subject: [PATCH 06/14] Combine all docker RPMs to one line --- catalogue/administration.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/catalogue/administration.yml b/catalogue/administration.yml index da052cf..87371d8 100644 --- a/catalogue/administration.yml +++ b/catalogue/administration.yml @@ -39,11 +39,4 @@ choices: Software that uses virtualization to create and manage containers. actions: - enable_yum_repo:https://download.docker.com/linux/fedora/docker-ce.repo - - rpm:docker-compose - - rpm:docker-distribution - - rpm:docker-cli - - rpm:docker-ce - - rpm:docker-ce-cli - - rpm:containerd.io - - rpm:docker-buildx-plugin - - rpm:docker-compose-plugin + - rpm:docker-compose docker-distribution docker-cli docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin From ad6b3bd4a86165bd631518447f3a1089d3fbd868 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sun, 5 Jan 2025 00:09:31 -0600 Subject: [PATCH 07/14] Fix systemd service enablement --- catalogue/administration.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/catalogue/administration.yml b/catalogue/administration.yml index 87371d8..4a42269 100644 --- a/catalogue/administration.yml +++ b/catalogue/administration.yml @@ -18,10 +18,7 @@ choices: actions: - enable_yum_repo:https://pkgs.tailscale.com/stable/fedora/tailscale.repo - rpm:tailscale - services: - name: tailscaled - enabled: yes - state: started + - sh:systemctl enable tailscaled # todo: Ktailctl and Tailscale Status extension, don't know how to have desktop specific functions here - name: Ansible From 0e2d8556e2dfa5761584705e3b03dfab5e371c71 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sun, 5 Jan 2025 00:14:41 -0600 Subject: [PATCH 08/14] Move tailscale and docker actions to the same line --- catalogue/administration.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/catalogue/administration.yml b/catalogue/administration.yml index 4a42269..698c554 100644 --- a/catalogue/administration.yml +++ b/catalogue/administration.yml @@ -16,9 +16,7 @@ choices: provider: Tailscale description: | actions: - - enable_yum_repo:https://pkgs.tailscale.com/stable/fedora/tailscale.repo - - rpm:tailscale - - sh:systemctl enable tailscaled + - enable_yum_repo:https://pkgs.tailscale.com/stable/fedora/tailscale.repo; rpm:tailscale; sh:systemctl enable tailscaled # todo: Ktailctl and Tailscale Status extension, don't know how to have desktop specific functions here - name: Ansible @@ -35,5 +33,4 @@ choices: description: | Software that uses virtualization to create and manage containers. actions: - - enable_yum_repo:https://download.docker.com/linux/fedora/docker-ce.repo - - rpm:docker-compose docker-distribution docker-cli docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin + - enable_yum_repo:https://download.docker.com/linux/fedora/docker-ce.repo; rpm:docker-compose docker-distribution docker-cli docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin From 4a11bc26366adeec1ad2a193ab608beb800a9829 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sun, 5 Jan 2025 00:15:18 -0600 Subject: [PATCH 09/14] Spaces in ansible actions --- catalogue/administration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalogue/administration.yml b/catalogue/administration.yml index 698c554..6c8fd53 100644 --- a/catalogue/administration.yml +++ b/catalogue/administration.yml @@ -26,7 +26,7 @@ choices: Automate everything from code deployment to network configuration to cloud management, in a language that approaches plain English, using SSH, with no agents to install on remote systems. Ultramarine also include commonly used ansible collections. - actions: rpm:ansible;rpm:ansible-collection-ansible-netcommon;rpm:ansible-collection-ansible-utils;rpm:ansible-collection-ansible-posix;rpm:ansible-collection-ansible-windows + actions: rpm:ansible;rpm:ansible-collection-ansible-netcommon; rpm:ansible-collection-ansible-utils; rpm:ansible-collection-ansible-posix;rpm:ansible-collection-ansible-windows - name: Docker provider: Docker From 90cb72de75153d70bb25d307c440667e9c2458fd Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sun, 5 Jan 2025 00:17:02 -0600 Subject: [PATCH 10/14] More ansible spaces --- catalogue/administration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalogue/administration.yml b/catalogue/administration.yml index 6c8fd53..706e648 100644 --- a/catalogue/administration.yml +++ b/catalogue/administration.yml @@ -26,7 +26,7 @@ choices: Automate everything from code deployment to network configuration to cloud management, in a language that approaches plain English, using SSH, with no agents to install on remote systems. Ultramarine also include commonly used ansible collections. - actions: rpm:ansible;rpm:ansible-collection-ansible-netcommon; rpm:ansible-collection-ansible-utils; rpm:ansible-collection-ansible-posix;rpm:ansible-collection-ansible-windows + actions: rpm:ansible; rpm:ansible-collection-ansible-netcommon; rpm:ansible-collection-ansible-utils; rpm:ansible-collection-ansible-posix; rpm:ansible-collection-ansible-windows - name: Docker provider: Docker From 06b88ba8b8547e4448096e71070eef2346d9cb4e Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Sun, 5 Jan 2025 00:22:00 -0600 Subject: [PATCH 11/14] No spaces I guess --- catalogue/administration.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/catalogue/administration.yml b/catalogue/administration.yml index 706e648..19ab323 100644 --- a/catalogue/administration.yml +++ b/catalogue/administration.yml @@ -16,7 +16,7 @@ choices: provider: Tailscale description: | actions: - - enable_yum_repo:https://pkgs.tailscale.com/stable/fedora/tailscale.repo; rpm:tailscale; sh:systemctl enable tailscaled + - enable_yum_repo:https://pkgs.tailscale.com/stable/fedora/tailscale.repo;rpm:tailscale;sh:systemctl enable tailscaled # todo: Ktailctl and Tailscale Status extension, don't know how to have desktop specific functions here - name: Ansible @@ -26,11 +26,11 @@ choices: Automate everything from code deployment to network configuration to cloud management, in a language that approaches plain English, using SSH, with no agents to install on remote systems. Ultramarine also include commonly used ansible collections. - actions: rpm:ansible; rpm:ansible-collection-ansible-netcommon; rpm:ansible-collection-ansible-utils; rpm:ansible-collection-ansible-posix; rpm:ansible-collection-ansible-windows + actions: rpm:ansible;rpm:ansible-collection-ansible-netcommon;rpm:ansible-collection-ansible-utils;rpm:ansible-collection-ansible-posix;rpm:ansible-collection-ansible-windows - name: Docker provider: Docker description: | Software that uses virtualization to create and manage containers. actions: - - enable_yum_repo:https://download.docker.com/linux/fedora/docker-ce.repo; rpm:docker-compose docker-distribution docker-cli docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin + - enable_yum_repo:https://download.docker.com/linux/fedora/docker-ce.repo;rpm:docker-compose docker-distribution docker-cli docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin From 1e578285d729a08b84cc92a3a0bb016f59fff63b Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Mon, 6 Jan 2025 09:42:38 -0600 Subject: [PATCH 12/14] Fix up descriptions --- catalogue/administration.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/catalogue/administration.yml b/catalogue/administration.yml index 19ab323..6f908e2 100644 --- a/catalogue/administration.yml +++ b/catalogue/administration.yml @@ -2,19 +2,17 @@ category: Administration choices: - name: nmap Provider: nmap - description: | - utility for network discovery and security auditing. + description: utility for network discovery and security auditing. actions: rpm:nmap - name: virt-manager provider: virt-manager - description: | - Desktop tool for managing virtual machines via libvirt. + description: Desktop tool for managing virtual machines via libvirt. actions: rpm:virt-manager - name: Tailscale provider: Tailscale - description: | + description: Tailscale is a mesh VPN service that streamlines connecting devices and services securely across different networks. actions: - enable_yum_repo:https://pkgs.tailscale.com/stable/fedora/tailscale.repo;rpm:tailscale;sh:systemctl enable tailscaled # todo: Ktailctl and Tailscale Status extension, don't know how to have desktop specific functions here @@ -30,7 +28,6 @@ choices: - name: Docker provider: Docker - description: | - Software that uses virtualization to create and manage containers. + description: Software that uses virtualization to create and manage containers. actions: - enable_yum_repo:https://download.docker.com/linux/fedora/docker-ce.repo;rpm:docker-compose docker-distribution docker-cli docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin From 35e977c4a71705dee3c643ccdcdc3e43098971c1 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Mon, 6 Jan 2025 09:44:39 -0600 Subject: [PATCH 13/14] Move repo actions to same line --- catalogue/administration.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/catalogue/administration.yml b/catalogue/administration.yml index 6f908e2..d69bcb2 100644 --- a/catalogue/administration.yml +++ b/catalogue/administration.yml @@ -13,8 +13,7 @@ choices: - name: Tailscale provider: Tailscale description: Tailscale is a mesh VPN service that streamlines connecting devices and services securely across different networks. - actions: - - enable_yum_repo:https://pkgs.tailscale.com/stable/fedora/tailscale.repo;rpm:tailscale;sh:systemctl enable tailscaled + actions: enable_yum_repo:https://pkgs.tailscale.com/stable/fedora/tailscale.repo;rpm:tailscale;sh:systemctl enable tailscaled # todo: Ktailctl and Tailscale Status extension, don't know how to have desktop specific functions here - name: Ansible @@ -29,5 +28,4 @@ choices: - name: Docker provider: Docker description: Software that uses virtualization to create and manage containers. - actions: - - enable_yum_repo:https://download.docker.com/linux/fedora/docker-ce.repo;rpm:docker-compose docker-distribution docker-cli docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin + actions: enable_yum_repo:https://download.docker.com/linux/fedora/docker-ce.repo;rpm:docker-compose docker-distribution docker-cli docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin From c5a1a819427e1afac14e79775fe14f04a82c3921 Mon Sep 17 00:00:00 2001 From: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com> Date: Mon, 6 Jan 2025 17:57:03 -0600 Subject: [PATCH 14/14] Fix nmap provider caps Co-authored-by: madomado --- catalogue/administration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalogue/administration.yml b/catalogue/administration.yml index d69bcb2..6054ae7 100644 --- a/catalogue/administration.yml +++ b/catalogue/administration.yml @@ -1,7 +1,7 @@ category: Administration choices: - name: nmap - Provider: nmap + provider: nmap description: utility for network discovery and security auditing. actions: rpm:nmap