From 0bf9dde33389adbd3fc69df6cf57575021c70d5b Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Mon, 23 Mar 2020 21:24:37 +0100 Subject: [PATCH] Put this on hold for now --- ansible/post-deploy.yml | 19 ++++++++++--------- ansible/pre-deploy.yml | 21 --------------------- 2 files changed, 10 insertions(+), 30 deletions(-) diff --git a/ansible/post-deploy.yml b/ansible/post-deploy.yml index 01934dd..d214612 100644 --- a/ansible/post-deploy.yml +++ b/ansible/post-deploy.yml @@ -63,15 +63,16 @@ force: true become: true - - name: Set authorized_keys file for git user - lineinfile: - path: /var/lib/gitea/git/.ssh/authorized_keys - regexp: "^{{ lookup('file', '/home/git/.ssh/id_rsa.pub') }}" - line: "{{ lookup('file', '/home/git/.ssh/id_rsa.pub') }}{{ lookup('file', '/var/lib/gitea/git/.ssh/authorized_keys') }}" - state: present - insertbefore: BOF - create: true - become: true + # TODO(decentral1se): make this work... + # - name: Set authorized_keys file for git user + # lineinfile: + # path: /var/lib/gitea/git/.ssh/authorized_keys + # regexp: "^{{ lookup('file', '/home/git/.ssh/id_rsa.pub') }}" + # line: "{{ lookup('file', '/home/git/.ssh/id_rsa.pub') }}{{ lookup('file', '/var/lib/gitea/git/.ssh/authorized_keys') }}" + # state: present + # insertbefore: BOF + # create: true + # become: true - name: Symlink the authorized keys configuration file: diff --git a/ansible/pre-deploy.yml b/ansible/pre-deploy.yml index b0bb22d..deb5094 100644 --- a/ansible/pre-deploy.yml +++ b/ansible/pre-deploy.yml @@ -8,27 +8,6 @@ extensions: - yml - - name: Slurp the git user ssh public key - slurp: - src: /home/git/.ssh/id_rsa.pub - register: git_id_rsa - become: true - - - name: Slurp the git user ssh authorized_keys - slurp: - src: /var/lib/gitea/git/.ssh/authorized_keys - register: git_auth_keys - become: true - - - name: TEST TEST TEST - lineinfile: - path: /var/lib/gitea/git/.ssh/authorized_keys - regexp: "^{{ git_id_rsa['content'] }}" - line: "{{ git_id_rsa['content'] }}{{ git_auth_keys['content'] }}" - state: present - create: true - become: true - - name: Configure git.autonomic.zone domain dokku_domains: app: gitea