From a413e3c03d6f946bae25a1da8c30d58efb92f277 Mon Sep 17 00:00:00 2001 From: Daniel Liu Date: Sun, 3 Oct 2021 19:59:12 -0400 Subject: [PATCH] final fixes --- qemu/postinstall.yml | 36 ++++++++++++++++++++++++------------ roles/mirror/tasks/main.yml | 4 ++-- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/qemu/postinstall.yml b/qemu/postinstall.yml index bbdc57b..aed4531 100644 --- a/qemu/postinstall.yml +++ b/qemu/postinstall.yml @@ -1,16 +1,28 @@ --- - hosts: vm tasks: - # - name: Basic system configuration - # become: yes - # import_role: - # name: ../roles/system - # - name: Setting up ssh - # become: yes - # import_role: - # name: ../roles/ssh - # - name: Configuring nginx - # become: yes - # import_role: - # name: ../roles/nginx + - name: Basic system configuration + become: yes + import_role: + name: ../roles/system + - name: Setting up mirror + become: yes + import_role: + name: ../roles/mirror + - name: Setting up ssh + become: yes + import_role: + name: ../roles/ssh + - name: Configuring nginx + become: yes + import_role: + name: ../roles/nginx + - name: Configure rsync + become: yes + import_role: + name: ../roles/rsync + - name: Configure ftp + become: yes + import_role: + name: ../roles/ftp diff --git a/roles/mirror/tasks/main.yml b/roles/mirror/tasks/main.yml index 28699cf..bb3503d 100644 --- a/roles/mirror/tasks/main.yml +++ b/roles/mirror/tasks/main.yml @@ -42,7 +42,7 @@ - name: copy arthur and busybox into merlin copy: - src: "{{ role_path }}/tmeplates/root/merlin/{{ item.file }}" + src: "{{ role_path }}/templates/root/merlin/{{ item.file }}" dest: "/mirror/merlin/{{ item.dest }}" owner: root group: root @@ -113,4 +113,4 @@ # systemd: # name: merlin # state: started -# # enabled: yes \ No newline at end of file +# # enabled: yes