From 895d9e3251202fdca49d81babe9e3908ba9bd87d Mon Sep 17 00:00:00 2001 From: Andrew Wang Date: Sun, 3 Oct 2021 22:53:41 -0400 Subject: [PATCH] fixes --- libvirt/README.md | 4 ++-- libvirt/main.yml | 2 +- mirror/README.md | 5 ++++- mirror/main.yml | 1 + roles/ssh/tasks/main.yml | 12 ++++++------ 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/libvirt/README.md b/libvirt/README.md index 4d3fbd2..c229abb 100644 --- a/libvirt/README.md +++ b/libvirt/README.md @@ -58,7 +58,7 @@ and ssh ssh local@192.168.123.XXX ``` -in the machine switch to root and update before installing some packages and cloning the repo +In the vm switch to root, install some packages, and clone the repo. ``` $ sudo su $ cd @@ -66,7 +66,7 @@ $ apt update && apt upgrade $ apt install git ansible $ git clone https://git.csclub.uwaterloo.ca/public/mirror-env.git ``` -then enter `mirror-env/mirror` and use the instructions listed there +Then enter `mirror-env/mirror` and follow the instructions there. ## Troubleshooting ``` diff --git a/libvirt/main.yml b/libvirt/main.yml index 1a7eced..55a4180 100644 --- a/libvirt/main.yml +++ b/libvirt/main.yml @@ -1,7 +1,7 @@ --- - name: setup mirror vm hosts: 127.0.0.1 - gather_facts: false + gather_facts: no tasks: - name: mirbr0 network exists command: "virsh net-dumpxml mirbr0" diff --git a/mirror/README.md b/mirror/README.md index 81aec45..af2f640 100644 --- a/mirror/README.md +++ b/mirror/README.md @@ -1,2 +1,5 @@ # Mirror Playbook -This playbook will be run inside a vm to set up the mirror's services \ No newline at end of file +This playbook will be run inside a vm to set up the mirror's services +``` +ansible-playbook main.yml +``` \ No newline at end of file diff --git a/mirror/main.yml b/mirror/main.yml index e2fd5dc..dfe737f 100644 --- a/mirror/main.yml +++ b/mirror/main.yml @@ -1,5 +1,6 @@ - name: setup mirror vm hosts: 127.0.0.1 + gather_facts: no roles: - "../roles/system" - "../roles/mirror" diff --git a/roles/ssh/tasks/main.yml b/roles/ssh/tasks/main.yml index 72c4ba5..49fb781 100644 --- a/roles/ssh/tasks/main.yml +++ b/roles/ssh/tasks/main.yml @@ -30,12 +30,12 @@ -N "" creates: /etc/ssh/{{ item.file }} loop: - - { file: ssh_host_dsa_key, type: dsa } - - { file: ssh_host_ecdsa_key, type: ecdsa } - - { file: ssh_host_ed25519_key, type: ed25519 } - - { file: ssh_host_rsa_key, type: rsa } - - { file: ssh_mirror_ed25519_key, type: ed25519 } - - { file: ssh_mirror_rsa_key, type: rsa } + - { file: ssh_host_dsa_key, type: dsa } + - { file: ssh_host_ecdsa_key, type: ecdsa } + - { file: ssh_host_ed25519_key, type: ed25519 } + - { file: ssh_host_rsa_key, type: rsa } + - { file: ssh_mirror_host_ed25519_key, type: ed25519 } + - { file: ssh_mirror_host_rsa_key, type: rsa } - name: create .ssh for mirror and push file: