From 5b4f99023be33b0b0251793d241381e48aa2cb6e Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Thu, 17 Aug 2023 21:25:38 +0200 Subject: [PATCH] Added role to make server accessible via SSH by Drone --- ansible/inventories/group_vars/applications/public.yaml | 1 + ansible/inventories/group_vars/ci/public.yaml | 2 -- ansible/inventories/group_vars/git/public.yaml | 2 ++ .../{applications => application_server}/public.yaml | 0 ansible/inventories/production | 2 +- ansible/roles/drone/tasks/main.yml | 4 ++-- ansible/roles/drone_accessible/tasks/main.yaml | 6 ++++++ ansible/setup.yaml | 1 + 8 files changed, 13 insertions(+), 5 deletions(-) rename ansible/inventories/host_vars/{applications => application_server}/public.yaml (100%) create mode 100644 ansible/roles/drone_accessible/tasks/main.yaml diff --git a/ansible/inventories/group_vars/applications/public.yaml b/ansible/inventories/group_vars/applications/public.yaml index 44597f9..5dd237d 100644 --- a/ansible/inventories/group_vars/applications/public.yaml +++ b/ansible/inventories/group_vars/applications/public.yaml @@ -1,3 +1,4 @@ --- ssh_user: 2martensAdmin admin_mail: admin@2martens.de +drone_ssh_key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGuTfzwAfRQCGa1zLsRSX5IGl4A/XHZ7p7LFRfLMA78J drone@devops diff --git a/ansible/inventories/group_vars/ci/public.yaml b/ansible/inventories/group_vars/ci/public.yaml index c011ec0..b153e27 100644 --- a/ansible/inventories/group_vars/ci/public.yaml +++ b/ansible/inventories/group_vars/ci/public.yaml @@ -2,5 +2,3 @@ ssh_user: 2martensAdmin admin_mail: admin@2martens.de ci_domain: ci.2martens.de -gitea_user: 2martens -gitea_url: https://git.2martens.de diff --git a/ansible/inventories/group_vars/git/public.yaml b/ansible/inventories/group_vars/git/public.yaml index ed93b70..62ef85d 100644 --- a/ansible/inventories/group_vars/git/public.yaml +++ b/ansible/inventories/group_vars/git/public.yaml @@ -1,6 +1,8 @@ --- ssh_user: giteajim host_architecture: amd64 +gitea_user: 2martens +gitea_url: https://git.2martens.de gitea_domain: git.2martens.de gitea_port: 64745 gitea_name: 2martens Gitea diff --git a/ansible/inventories/host_vars/applications/public.yaml b/ansible/inventories/host_vars/application_server/public.yaml similarity index 100% rename from ansible/inventories/host_vars/applications/public.yaml rename to ansible/inventories/host_vars/application_server/public.yaml diff --git a/ansible/inventories/production b/ansible/inventories/production index 84ac856..9c14a80 100644 --- a/ansible/inventories/production +++ b/ansible/inventories/production @@ -1,6 +1,6 @@ [setup] devops ansible_host=localhost ansible_connection=local ansible_python_interpreter=python3 -applications ansible_host=localhost ansible_connection=local ansible_python_interpreter=python3 +application_server ansible_host=localhost ansible_connection=local ansible_python_interpreter=python3 [ci] devops ansible_host=49.12.69.146 ansible_python_interpreter=python3 diff --git a/ansible/roles/drone/tasks/main.yml b/ansible/roles/drone/tasks/main.yml index 29a7177..49ed36b 100644 --- a/ansible/roles/drone/tasks/main.yml +++ b/ansible/roles/drone/tasks/main.yml @@ -1,5 +1,5 @@ --- -- name: Set up apache for drone +- name: Set up apache for Drone ansible.builtin.import_tasks: apache.yml -- name: Set up drone +- name: Set up Drone ansible.builtin.import_tasks: drone.yml diff --git a/ansible/roles/drone_accessible/tasks/main.yaml b/ansible/roles/drone_accessible/tasks/main.yaml new file mode 100644 index 0000000..276b551 --- /dev/null +++ b/ansible/roles/drone_accessible/tasks/main.yaml @@ -0,0 +1,6 @@ +--- +- name: Add SSH key for Drone + ansible.posix.authorized_key: + key: "{{ drone_ssh_key }}" + user: "{{ ssh_user }}" + state: present diff --git a/ansible/setup.yaml b/ansible/setup.yaml index 8ea1be1..14f10ec 100644 --- a/ansible/setup.yaml +++ b/ansible/setup.yaml @@ -32,6 +32,7 @@ become_method: ansible.builtin.sudo remote_user: "{{ ssh_user }}" roles: + - drone_accessible - docker - nginx - letsencrypt