From bc6b346b6bcd91662fecd728e0716032202a16fb Mon Sep 17 00:00:00 2001 From: Rene Date: Sat, 25 Jun 2022 13:54:16 +0200 Subject: [PATCH 1/7] added new ssh key --- roles/base/files/public_keys/notebook_id_rsa.pub | 1 + roles/base/tasks/users/all.yml | 1 + 2 files changed, 2 insertions(+) create mode 100644 roles/base/files/public_keys/notebook_id_rsa.pub diff --git a/roles/base/files/public_keys/notebook_id_rsa.pub b/roles/base/files/public_keys/notebook_id_rsa.pub new file mode 100644 index 0000000..cb375b4 --- /dev/null +++ b/roles/base/files/public_keys/notebook_id_rsa.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDACW5vF64ynbWyY/7xKqXq2GVeYRTLvwTlO7wT5OBKqwzNoAbF2WsoyTKt6+Bo7M/i7gcr3hXfVkL1tw+spogMtLy2kjsJ9WY3vysy6VCXuWFDeFnoJQnwnfpUA8dGTGPI9mavf4K1z8l45h64H0bITZOkRKJ3iXdviXNfpn8TwRxU9absXbmBNo0dfwqul6ek9jFqzYkq/1hXHCImUuvRHn9ynIGj5f/AMXVTkXkoP1SmF+wyXLcswja0mHssOkdOw2Y0vJsLlG6YKehsivOM0CP2OCBMq2I+wv9Tk4TYgGhp1pFeq4j2imb98AOHuECipy+h0JFI3c+jSo2vWctFkklOQDWQVZU7aJxNTS3YoqOPDS+FJ6CW00xAq6Qyt8uoDbpgFrEzvjadZ5LBe1699G7aQxUmM+joWSYkRcDmEXA2aY+1G1y8XmNlnykdHwgbKufRlFGqjXllK/EeYiKl2g6bTA8pfxu8yuR98sGQihx9LduDwd87Sg2U0OhKAes= rene@TUXEDO-Book-XP1511 diff --git a/roles/base/tasks/users/all.yml b/roles/base/tasks/users/all.yml index a84b750..f705366 100644 --- a/roles/base/tasks/users/all.yml +++ b/roles/base/tasks/users/all.yml @@ -18,6 +18,7 @@ - public_keys/id_ed25519.pub - public_keys/rene_id_rsa.pub - public_keys/yubikey.pub + - public_keys/notebook_id_rsa.pub - name: users | {{ user }} | install private ssh keys copy: From 4aa195b013914379faa81b5bbe96b482f33b992d Mon Sep 17 00:00:00 2001 From: Rene Date: Sat, 25 Jun 2022 14:05:28 +0200 Subject: [PATCH 2/7] include instead of import --- roles/webserver/tasks/apps/nextcloud/nextcloud.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/webserver/tasks/apps/nextcloud/nextcloud.yml b/roles/webserver/tasks/apps/nextcloud/nextcloud.yml index 563bab3..53bec2b 100644 --- a/roles/webserver/tasks/apps/nextcloud/nextcloud.yml +++ b/roles/webserver/tasks/apps/nextcloud/nextcloud.yml @@ -1,4 +1,4 @@ -- import_vars: nextcloud.yml +- include_vars: nextcloud.yml - import_tasks: apps/nextcloud/prereq.yml - name: webserver | nextcloud | get tar ball From 096891428bb32dac7e2572ff4ed199e999e69148 Mon Sep 17 00:00:00 2001 From: Rene Date: Sat, 25 Jun 2022 14:31:28 +0200 Subject: [PATCH 3/7] follow redirects --- roles/webserver/tasks/apps/nextcloud/nextcloud.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/webserver/tasks/apps/nextcloud/nextcloud.yml b/roles/webserver/tasks/apps/nextcloud/nextcloud.yml index 53bec2b..baae2ff 100644 --- a/roles/webserver/tasks/apps/nextcloud/nextcloud.yml +++ b/roles/webserver/tasks/apps/nextcloud/nextcloud.yml @@ -5,10 +5,11 @@ uri: url: "https://download.nextcloud.com/server/releases/latest.zip" dest: "/tmp/nextcloud_latest.zip" + follow_redirects: all - name: webserver | nextcloud | extract archive unarchive: src: "/tmp/nextcloud_latest.zip" dest: "/var/www/nextcloud/" owner: "{{ webuser }}" - \ No newline at end of file + creates: True \ No newline at end of file From 2dde0776cd282e637c7a3741c982b35ecfd3c860 Mon Sep 17 00:00:00 2001 From: Rene Date: Sat, 25 Jun 2022 15:06:12 +0200 Subject: [PATCH 4/7] continue even if file is already downloaded --- roles/webserver/tasks/apps/nextcloud/nextcloud.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/roles/webserver/tasks/apps/nextcloud/nextcloud.yml b/roles/webserver/tasks/apps/nextcloud/nextcloud.yml index baae2ff..ce41f19 100644 --- a/roles/webserver/tasks/apps/nextcloud/nextcloud.yml +++ b/roles/webserver/tasks/apps/nextcloud/nextcloud.yml @@ -6,10 +6,17 @@ url: "https://download.nextcloud.com/server/releases/latest.zip" dest: "/tmp/nextcloud_latest.zip" follow_redirects: all + rescue: + - set_fact: task_failed=true - name: webserver | nextcloud | extract archive unarchive: src: "/tmp/nextcloud_latest.zip" dest: "/var/www/nextcloud/" owner: "{{ webuser }}" - creates: True \ No newline at end of file + creates: True + +- name: webserver | nextcloud | remove temporary file + file: + path: "/tmp/nextcloud_latest.zip" + state: absent \ No newline at end of file From 344867483610e3395381ea7fe0d88372c259b818 Mon Sep 17 00:00:00 2001 From: Rene Date: Sat, 25 Jun 2022 15:09:33 +0200 Subject: [PATCH 5/7] removed a block instruction --- roles/webserver/tasks/apps/nextcloud/nextcloud.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/roles/webserver/tasks/apps/nextcloud/nextcloud.yml b/roles/webserver/tasks/apps/nextcloud/nextcloud.yml index ce41f19..b1817e7 100644 --- a/roles/webserver/tasks/apps/nextcloud/nextcloud.yml +++ b/roles/webserver/tasks/apps/nextcloud/nextcloud.yml @@ -6,8 +6,6 @@ url: "https://download.nextcloud.com/server/releases/latest.zip" dest: "/tmp/nextcloud_latest.zip" follow_redirects: all - rescue: - - set_fact: task_failed=true - name: webserver | nextcloud | extract archive unarchive: From ba553b7f6a31730869d82f94711dbcd193cb8adb Mon Sep 17 00:00:00 2001 From: Rene Date: Sat, 25 Jun 2022 15:23:32 +0200 Subject: [PATCH 6/7] create dir first --- roles/webserver/tasks/apps/nextcloud/nextcloud.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/roles/webserver/tasks/apps/nextcloud/nextcloud.yml b/roles/webserver/tasks/apps/nextcloud/nextcloud.yml index b1817e7..dbf2fc4 100644 --- a/roles/webserver/tasks/apps/nextcloud/nextcloud.yml +++ b/roles/webserver/tasks/apps/nextcloud/nextcloud.yml @@ -7,12 +7,19 @@ dest: "/tmp/nextcloud_latest.zip" follow_redirects: all +- name: webserver | nextcloud | create directory + file: + path: "/var/www/nextcloud/" + state: directory + owner: "{{ webuser }}" + group: "{{ webuser }}" + - name: webserver | nextcloud | extract archive unarchive: src: "/tmp/nextcloud_latest.zip" dest: "/var/www/nextcloud/" owner: "{{ webuser }}" - creates: True + group: "{{ webuser }}" - name: webserver | nextcloud | remove temporary file file: From 3fdc85d4808c3d107da4874b08a48e13797eddc0 Mon Sep 17 00:00:00 2001 From: Rene Date: Sat, 25 Jun 2022 15:30:44 +0200 Subject: [PATCH 7/7] subdir not needed --- roles/webserver/tasks/apps/nextcloud/nextcloud.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/roles/webserver/tasks/apps/nextcloud/nextcloud.yml b/roles/webserver/tasks/apps/nextcloud/nextcloud.yml index dbf2fc4..f954ee6 100644 --- a/roles/webserver/tasks/apps/nextcloud/nextcloud.yml +++ b/roles/webserver/tasks/apps/nextcloud/nextcloud.yml @@ -7,17 +7,10 @@ dest: "/tmp/nextcloud_latest.zip" follow_redirects: all -- name: webserver | nextcloud | create directory - file: - path: "/var/www/nextcloud/" - state: directory - owner: "{{ webuser }}" - group: "{{ webuser }}" - - name: webserver | nextcloud | extract archive unarchive: src: "/tmp/nextcloud_latest.zip" - dest: "/var/www/nextcloud/" + dest: "/var/www/" owner: "{{ webuser }}" group: "{{ webuser }}"