From 10940b64fd8851310972c348f65040b9e4c67821 Mon Sep 17 00:00:00 2001 From: Alexandre Pires Date: Tue, 24 Sep 2024 21:47:11 +0200 Subject: [PATCH] Refactor SSH connection check step to clarify purpose --- .github/workflows/ansible-apply.yaml | 2 +- .github/workflows/terraform-k8apps-apply.yaml | 2 +- terraform/{k8apps => k8sapps}/.vault | 0 terraform/{k8apps => k8sapps}/backend.tf | 0 terraform/{k8apps => k8sapps}/buckets.tf | 0 terraform/{k8apps => k8sapps}/collabora.tf | 0 terraform/{k8apps => k8sapps}/config.tf | 0 terraform/{k8apps => k8sapps}/gitea.tf | 0 terraform/{k8apps => k8sapps}/iam.tf | 0 terraform/{k8apps => k8sapps}/m3uproxy.tf | 0 terraform/{k8apps => k8sapps}/modules/k8s_mariadb/main.tf | 0 terraform/{k8apps => k8sapps}/modules/k8s_mariadb/outputs.tf | 0 terraform/{k8apps => k8sapps}/modules/k8s_mariadb/provider.tf | 0 terraform/{k8apps => k8sapps}/modules/k8s_mariadb/variables.tf | 0 terraform/{k8apps => k8sapps}/modules/scw_backup_job/config.tf | 0 terraform/{k8apps => k8sapps}/modules/scw_backup_job/main.tf | 0 .../{k8apps => k8sapps}/modules/scw_backup_job/provider.tf | 0 .../modules/scw_backup_job/resources/rclone.conf | 0 .../{k8apps => k8sapps}/modules/scw_backup_job/variables.tf | 0 terraform/{k8apps => k8sapps}/nextcloud.tf | 0 terraform/{k8apps => k8sapps}/operator.tf | 0 terraform/{k8apps => k8sapps}/provider.tf | 0 .../{k8apps => k8sapps}/resources/apache2/000-default.conf | 0 terraform/{k8apps => k8sapps}/resources/collabora/coolwsd.xml | 0 terraform/{k8apps => k8sapps}/resources/m3uproxy/m3uproxy.json | 0 terraform/{k8apps => k8sapps}/resources/m3uproxy/playlist.json | 0 .../{k8apps => k8sapps}/resources/nextcloud-server-snippet.conf | 0 terraform/{k8apps => k8sapps}/resources/squid/squid.conf | 0 .../{k8apps => k8sapps}/resources/wireguard/wireguard.conf.tpl | 0 terraform/{k8apps => k8sapps}/sectool.env | 0 terraform/{k8apps => k8sapps}/variables.tf | 0 terraform/{k8apps => k8sapps}/wordpress.tf | 0 32 files changed, 2 insertions(+), 2 deletions(-) rename terraform/{k8apps => k8sapps}/.vault (100%) rename terraform/{k8apps => k8sapps}/backend.tf (100%) rename terraform/{k8apps => k8sapps}/buckets.tf (100%) rename terraform/{k8apps => k8sapps}/collabora.tf (100%) rename terraform/{k8apps => k8sapps}/config.tf (100%) rename terraform/{k8apps => k8sapps}/gitea.tf (100%) rename terraform/{k8apps => k8sapps}/iam.tf (100%) rename terraform/{k8apps => k8sapps}/m3uproxy.tf (100%) rename terraform/{k8apps => k8sapps}/modules/k8s_mariadb/main.tf (100%) rename terraform/{k8apps => k8sapps}/modules/k8s_mariadb/outputs.tf (100%) rename terraform/{k8apps => k8sapps}/modules/k8s_mariadb/provider.tf (100%) rename terraform/{k8apps => k8sapps}/modules/k8s_mariadb/variables.tf (100%) rename terraform/{k8apps => k8sapps}/modules/scw_backup_job/config.tf (100%) rename terraform/{k8apps => k8sapps}/modules/scw_backup_job/main.tf (100%) rename terraform/{k8apps => k8sapps}/modules/scw_backup_job/provider.tf (100%) rename terraform/{k8apps => k8sapps}/modules/scw_backup_job/resources/rclone.conf (100%) rename terraform/{k8apps => k8sapps}/modules/scw_backup_job/variables.tf (100%) rename terraform/{k8apps => k8sapps}/nextcloud.tf (100%) rename terraform/{k8apps => k8sapps}/operator.tf (100%) rename terraform/{k8apps => k8sapps}/provider.tf (100%) rename terraform/{k8apps => k8sapps}/resources/apache2/000-default.conf (100%) rename terraform/{k8apps => k8sapps}/resources/collabora/coolwsd.xml (100%) rename terraform/{k8apps => k8sapps}/resources/m3uproxy/m3uproxy.json (100%) rename terraform/{k8apps => k8sapps}/resources/m3uproxy/playlist.json (100%) rename terraform/{k8apps => k8sapps}/resources/nextcloud-server-snippet.conf (100%) rename terraform/{k8apps => k8sapps}/resources/squid/squid.conf (100%) rename terraform/{k8apps => k8sapps}/resources/wireguard/wireguard.conf.tpl (100%) rename terraform/{k8apps => k8sapps}/sectool.env (100%) rename terraform/{k8apps => k8sapps}/variables.tf (100%) rename terraform/{k8apps => k8sapps}/wordpress.tf (100%) diff --git a/.github/workflows/ansible-apply.yaml b/.github/workflows/ansible-apply.yaml index 102bcbc..7da3b04 100644 --- a/.github/workflows/ansible-apply.yaml +++ b/.github/workflows/ansible-apply.yaml @@ -61,7 +61,7 @@ jobs: DISPLAY=None SSH_ASKPASS=~/.ssh_askpass ssh-add ~/.ssh/id_ecdsa < /dev/null rm ~/.ssh_askpass - - name: Check SSH Connection + - name: Check SSH Connection to remote hosts env: TRUSTED_HOSTS: ${{ secrets.TRUSTED_HOSTS }} ANSIBLE_USER: ${{ secrets.ANSIBLE_USER }} diff --git a/.github/workflows/terraform-k8apps-apply.yaml b/.github/workflows/terraform-k8apps-apply.yaml index 8de1da3..0374509 100644 --- a/.github/workflows/terraform-k8apps-apply.yaml +++ b/.github/workflows/terraform-k8apps-apply.yaml @@ -60,7 +60,7 @@ jobs: DISPLAY=None SSH_ASKPASS=~/.ssh_askpass ssh-add ~/.ssh/id_ecdsa < /dev/null rm ~/.ssh_askpass - - name: Check SSH Connection + - name: Check SSH Connection to remote hosts env: TRUSTED_HOSTS: ${{ secrets.TRUSTED_HOSTS }} ANSIBLE_USER: ${{ secrets.ANSIBLE_USER }} diff --git a/terraform/k8apps/.vault b/terraform/k8sapps/.vault similarity index 100% rename from terraform/k8apps/.vault rename to terraform/k8sapps/.vault diff --git a/terraform/k8apps/backend.tf b/terraform/k8sapps/backend.tf similarity index 100% rename from terraform/k8apps/backend.tf rename to terraform/k8sapps/backend.tf diff --git a/terraform/k8apps/buckets.tf b/terraform/k8sapps/buckets.tf similarity index 100% rename from terraform/k8apps/buckets.tf rename to terraform/k8sapps/buckets.tf diff --git a/terraform/k8apps/collabora.tf b/terraform/k8sapps/collabora.tf similarity index 100% rename from terraform/k8apps/collabora.tf rename to terraform/k8sapps/collabora.tf diff --git a/terraform/k8apps/config.tf b/terraform/k8sapps/config.tf similarity index 100% rename from terraform/k8apps/config.tf rename to terraform/k8sapps/config.tf diff --git a/terraform/k8apps/gitea.tf b/terraform/k8sapps/gitea.tf similarity index 100% rename from terraform/k8apps/gitea.tf rename to terraform/k8sapps/gitea.tf diff --git a/terraform/k8apps/iam.tf b/terraform/k8sapps/iam.tf similarity index 100% rename from terraform/k8apps/iam.tf rename to terraform/k8sapps/iam.tf diff --git a/terraform/k8apps/m3uproxy.tf b/terraform/k8sapps/m3uproxy.tf similarity index 100% rename from terraform/k8apps/m3uproxy.tf rename to terraform/k8sapps/m3uproxy.tf diff --git a/terraform/k8apps/modules/k8s_mariadb/main.tf b/terraform/k8sapps/modules/k8s_mariadb/main.tf similarity index 100% rename from terraform/k8apps/modules/k8s_mariadb/main.tf rename to terraform/k8sapps/modules/k8s_mariadb/main.tf diff --git a/terraform/k8apps/modules/k8s_mariadb/outputs.tf b/terraform/k8sapps/modules/k8s_mariadb/outputs.tf similarity index 100% rename from terraform/k8apps/modules/k8s_mariadb/outputs.tf rename to terraform/k8sapps/modules/k8s_mariadb/outputs.tf diff --git a/terraform/k8apps/modules/k8s_mariadb/provider.tf b/terraform/k8sapps/modules/k8s_mariadb/provider.tf similarity index 100% rename from terraform/k8apps/modules/k8s_mariadb/provider.tf rename to terraform/k8sapps/modules/k8s_mariadb/provider.tf diff --git a/terraform/k8apps/modules/k8s_mariadb/variables.tf b/terraform/k8sapps/modules/k8s_mariadb/variables.tf similarity index 100% rename from terraform/k8apps/modules/k8s_mariadb/variables.tf rename to terraform/k8sapps/modules/k8s_mariadb/variables.tf diff --git a/terraform/k8apps/modules/scw_backup_job/config.tf b/terraform/k8sapps/modules/scw_backup_job/config.tf similarity index 100% rename from terraform/k8apps/modules/scw_backup_job/config.tf rename to terraform/k8sapps/modules/scw_backup_job/config.tf diff --git a/terraform/k8apps/modules/scw_backup_job/main.tf b/terraform/k8sapps/modules/scw_backup_job/main.tf similarity index 100% rename from terraform/k8apps/modules/scw_backup_job/main.tf rename to terraform/k8sapps/modules/scw_backup_job/main.tf diff --git a/terraform/k8apps/modules/scw_backup_job/provider.tf b/terraform/k8sapps/modules/scw_backup_job/provider.tf similarity index 100% rename from terraform/k8apps/modules/scw_backup_job/provider.tf rename to terraform/k8sapps/modules/scw_backup_job/provider.tf diff --git a/terraform/k8apps/modules/scw_backup_job/resources/rclone.conf b/terraform/k8sapps/modules/scw_backup_job/resources/rclone.conf similarity index 100% rename from terraform/k8apps/modules/scw_backup_job/resources/rclone.conf rename to terraform/k8sapps/modules/scw_backup_job/resources/rclone.conf diff --git a/terraform/k8apps/modules/scw_backup_job/variables.tf b/terraform/k8sapps/modules/scw_backup_job/variables.tf similarity index 100% rename from terraform/k8apps/modules/scw_backup_job/variables.tf rename to terraform/k8sapps/modules/scw_backup_job/variables.tf diff --git a/terraform/k8apps/nextcloud.tf b/terraform/k8sapps/nextcloud.tf similarity index 100% rename from terraform/k8apps/nextcloud.tf rename to terraform/k8sapps/nextcloud.tf diff --git a/terraform/k8apps/operator.tf b/terraform/k8sapps/operator.tf similarity index 100% rename from terraform/k8apps/operator.tf rename to terraform/k8sapps/operator.tf diff --git a/terraform/k8apps/provider.tf b/terraform/k8sapps/provider.tf similarity index 100% rename from terraform/k8apps/provider.tf rename to terraform/k8sapps/provider.tf diff --git a/terraform/k8apps/resources/apache2/000-default.conf b/terraform/k8sapps/resources/apache2/000-default.conf similarity index 100% rename from terraform/k8apps/resources/apache2/000-default.conf rename to terraform/k8sapps/resources/apache2/000-default.conf diff --git a/terraform/k8apps/resources/collabora/coolwsd.xml b/terraform/k8sapps/resources/collabora/coolwsd.xml similarity index 100% rename from terraform/k8apps/resources/collabora/coolwsd.xml rename to terraform/k8sapps/resources/collabora/coolwsd.xml diff --git a/terraform/k8apps/resources/m3uproxy/m3uproxy.json b/terraform/k8sapps/resources/m3uproxy/m3uproxy.json similarity index 100% rename from terraform/k8apps/resources/m3uproxy/m3uproxy.json rename to terraform/k8sapps/resources/m3uproxy/m3uproxy.json diff --git a/terraform/k8apps/resources/m3uproxy/playlist.json b/terraform/k8sapps/resources/m3uproxy/playlist.json similarity index 100% rename from terraform/k8apps/resources/m3uproxy/playlist.json rename to terraform/k8sapps/resources/m3uproxy/playlist.json diff --git a/terraform/k8apps/resources/nextcloud-server-snippet.conf b/terraform/k8sapps/resources/nextcloud-server-snippet.conf similarity index 100% rename from terraform/k8apps/resources/nextcloud-server-snippet.conf rename to terraform/k8sapps/resources/nextcloud-server-snippet.conf diff --git a/terraform/k8apps/resources/squid/squid.conf b/terraform/k8sapps/resources/squid/squid.conf similarity index 100% rename from terraform/k8apps/resources/squid/squid.conf rename to terraform/k8sapps/resources/squid/squid.conf diff --git a/terraform/k8apps/resources/wireguard/wireguard.conf.tpl b/terraform/k8sapps/resources/wireguard/wireguard.conf.tpl similarity index 100% rename from terraform/k8apps/resources/wireguard/wireguard.conf.tpl rename to terraform/k8sapps/resources/wireguard/wireguard.conf.tpl diff --git a/terraform/k8apps/sectool.env b/terraform/k8sapps/sectool.env similarity index 100% rename from terraform/k8apps/sectool.env rename to terraform/k8sapps/sectool.env diff --git a/terraform/k8apps/variables.tf b/terraform/k8sapps/variables.tf similarity index 100% rename from terraform/k8apps/variables.tf rename to terraform/k8sapps/variables.tf diff --git a/terraform/k8apps/wordpress.tf b/terraform/k8sapps/wordpress.tf similarity index 100% rename from terraform/k8apps/wordpress.tf rename to terraform/k8sapps/wordpress.tf