From 1bbb69261df8ca28924cc47581c1acd8ef6014f5 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Thu, 30 Mar 2023 10:44:40 +0200 Subject: [PATCH] copr-backend: ssh_config is actually a template --- roles/copr/backend/tasks/main.yml | 10 ++++++++-- roles/copr/backend/tasks/resalloc.yml | 7 +++++-- .../{files/ssh_config => templates/ssh_config.j2} | 0 3 files changed, 13 insertions(+), 4 deletions(-) rename roles/copr/backend/{files/ssh_config => templates/ssh_config.j2} (100%) diff --git a/roles/copr/backend/tasks/main.yml b/roles/copr/backend/tasks/main.yml index fd78ea8848..6d72da9021 100644 --- a/roles/copr/backend/tasks/main.yml +++ b/roles/copr/backend/tasks/main.yml @@ -64,9 +64,15 @@ copy: src="{{ private }}/files/copr/buildsys.priv" dest=/home/copr/.ssh/id_rsa owner=copr group=copr mode=600 - name: setup copr user ssh config file - copy: src="ssh_config" dest=/home/copr/.ssh/config owner=copr group=copr mode=600 + template: + src: "ssh_config.j2" + dest: /var/lib/resallocserver/.ssh/config + owner: resalloc + group: resalloc + mode: 0600 tags: - - copr_ssh_config + - backend_to_hv_ssh_config + - provision_config - name: check known_hosts file command: stat /home/copr/.ssh/known_hosts diff --git a/roles/copr/backend/tasks/resalloc.yml b/roles/copr/backend/tasks/resalloc.yml index 5ba0cff8a7..5cea9fea52 100644 --- a/roles/copr/backend/tasks/resalloc.yml +++ b/roles/copr/backend/tasks/resalloc.yml @@ -113,12 +113,15 @@ mode: 0600 - name: resalloc, ssh config file - copy: - src: "ssh_config" + template: + src: "ssh_config.j2" dest: /var/lib/resallocserver/.ssh/config owner: resalloc group: resalloc mode: 0600 + tags: + - backend_to_hv_ssh_config + - provision_config - name: resalloc, server config template: diff --git a/roles/copr/backend/files/ssh_config b/roles/copr/backend/templates/ssh_config.j2 similarity index 100% rename from roles/copr/backend/files/ssh_config rename to roles/copr/backend/templates/ssh_config.j2