From b2b93879c23834f9fc377f83d889259fe1be92b0 Mon Sep 17 00:00:00 2001 From: rasmus Date: Sat, 27 Jul 2024 23:54:50 +0300 Subject: [PATCH] mv to ansible/ --- ansible.cfg | 2 +- ansible-bind-primary.yml => ansible/bind-primary.yml | 0 ansible-doors.yml => ansible/doors.yml | 0 inventory.yml => ansible/inventory.yml | 0 ansible-kubernetes.yml => ansible/kubernetes.yml | 0 ssh_config => ansible/ssh_config | 2 +- .../update-ssh-config.yaml | 6 +++--- {ansible-playbooks => ansible}/zrepl/zrepl.yml | 0 {ansible-playbooks => ansible}/zrepl/zrepl_nas.yml.j2 | 0 {ansible-playbooks => ansible}/zrepl/zrepl_offsite.yml.j2 | 0 known_hosts | 2 +- 11 files changed, 6 insertions(+), 6 deletions(-) rename ansible-bind-primary.yml => ansible/bind-primary.yml (100%) rename ansible-doors.yml => ansible/doors.yml (100%) rename inventory.yml => ansible/inventory.yml (100%) rename ansible-kubernetes.yml => ansible/kubernetes.yml (100%) rename ssh_config => ansible/ssh_config (98%) rename ansible-update-ssh-config.yaml => ansible/update-ssh-config.yaml (92%) rename {ansible-playbooks => ansible}/zrepl/zrepl.yml (100%) rename {ansible-playbooks => ansible}/zrepl/zrepl_nas.yml.j2 (100%) rename {ansible-playbooks => ansible}/zrepl/zrepl_offsite.yml.j2 (100%) diff --git a/ansible.cfg b/ansible.cfg index 90a4b83..8d8c73d 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -1,5 +1,5 @@ [defaults] -inventory = inventory.yml +inventory = ansible/inventory.yml nocows = 1 pattern = deprecation_warnings = False diff --git a/ansible-bind-primary.yml b/ansible/bind-primary.yml similarity index 100% rename from ansible-bind-primary.yml rename to ansible/bind-primary.yml diff --git a/ansible-doors.yml b/ansible/doors.yml similarity index 100% rename from ansible-doors.yml rename to ansible/doors.yml diff --git a/inventory.yml b/ansible/inventory.yml similarity index 100% rename from inventory.yml rename to ansible/inventory.yml diff --git a/ansible-kubernetes.yml b/ansible/kubernetes.yml similarity index 100% rename from ansible-kubernetes.yml rename to ansible/kubernetes.yml diff --git a/ssh_config b/ansible/ssh_config similarity index 98% rename from ssh_config rename to ansible/ssh_config index a75949b..b083e5e 100644 --- a/ssh_config +++ b/ansible/ssh_config @@ -1,4 +1,4 @@ -# Use `ansible-playbook ansible-update-ssh-config.yml` to update this file +# Use `ansible-playbook ansible/update-ssh-config.yml` to update this file # Use `ssh -F ssh_config ...` to connect to target machine or # Add `Include ~/path/to/this/kube/ssh_config` in your ~/.ssh/config Host backdoor 100.102.3.3 diff --git a/ansible-update-ssh-config.yaml b/ansible/update-ssh-config.yaml similarity index 92% rename from ansible-update-ssh-config.yaml rename to ansible/update-ssh-config.yaml index 1aff4ca..cedb02c 100644 --- a/ansible-update-ssh-config.yaml +++ b/ansible/update-ssh-config.yaml @@ -9,7 +9,7 @@ ansible.builtin.copy: dest: known_hosts content: | - # Use `ansible-playbook ansible-update-ssh-config.yml` to update this file + # Use `ansible-playbook ansible/update-ssh-config.yml` to update this file {% for host in groups['all'] | sort %} {{ lookup('ansible.builtin.pipe', 'ssh-keyscan -t ecdsa %s ' % ( hostvars[host].get('ansible_host', host))) }} # {{ host }} @@ -18,7 +18,7 @@ ansible.builtin.copy: dest: ssh_config content: | - # Use `ansible-playbook ansible-update-ssh-config.yml` to update this file + # Use `ansible-playbook ansible/update-ssh-config.yml` to update this file # Use `ssh -F ssh_config ...` to connect to target machine or # Add `Include ~/path/to/this/kube/ssh_config` in your ~/.ssh/config {% for host in groups['all'] | sort %} @@ -60,7 +60,7 @@ group: root mode: '0644' content: | - # Use `ansible-playbook ansible-update-ssh-config.yml` from https://git.k-space.ee/k-space/kube/ to update this file + # Use `ansible-playbook ansible/update-ssh-config.yml` from https://git.k-space.ee/k-space/kube/ to update this file {% for user in admins + extra_admins | unique | sort %} {% for line in lookup("ansible.builtin.file", user + ".keys").split("\n") %} {% if line.startswith("sk-") %} diff --git a/ansible-playbooks/zrepl/zrepl.yml b/ansible/zrepl/zrepl.yml similarity index 100% rename from ansible-playbooks/zrepl/zrepl.yml rename to ansible/zrepl/zrepl.yml diff --git a/ansible-playbooks/zrepl/zrepl_nas.yml.j2 b/ansible/zrepl/zrepl_nas.yml.j2 similarity index 100% rename from ansible-playbooks/zrepl/zrepl_nas.yml.j2 rename to ansible/zrepl/zrepl_nas.yml.j2 diff --git a/ansible-playbooks/zrepl/zrepl_offsite.yml.j2 b/ansible/zrepl/zrepl_offsite.yml.j2 similarity index 100% rename from ansible-playbooks/zrepl/zrepl_offsite.yml.j2 rename to ansible/zrepl/zrepl_offsite.yml.j2 diff --git a/known_hosts b/known_hosts index ef9b741..8ab08ee 100644 --- a/known_hosts +++ b/known_hosts @@ -1,4 +1,4 @@ -# Use `ansible-playbook ansible-update-ssh-config.yml` to update this file +# Use `ansible-playbook ansible/update-ssh-config.yml` to update this file 100.102.3.3 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBN4SifLddYAz8CasmFwX5TQbiM8atAYMFuDQRchclHM0sq9Pi8wRxSZK8SHON4Y7YFsIY+cXnQ2Wx4FpzKmfJYE= # backdoor 100.102.3.2 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE8/E7PDqTrTdU+MFurHkIPzTBTGcSJqXuv5n0Ugd/IlvOr2v+eYi3ma91pSBmF5Hjy9foWypCLZfH+vWMkV0gs= # frontdoor 100.102.3.1 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFcH8D2AhnESw3uu2f4EHBhT9rORQQJJ3TlbwN+kro5tRZsZk4p3MKabBiuCSZw2KWjfu0MY4yHSCrUUQrggJDM= # grounddoor