From 81bc8267932cfc4800149156cc2d77044bbefaf2 Mon Sep 17 00:00:00 2001
From: Bertrand Lanson <bertrand.lanson@protonmail.com>
Date: Fri, 11 Aug 2023 20:53:23 +0200
Subject: [PATCH] binary installs properly

---
 defaults/main.yml        | 4 ++--
 tasks/install_docker.yml | 2 ++
 tasks/install_host.yml   | 8 ++++----
 tasks/main.yml           | 3 +++
 4 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 tasks/install_docker.yml

diff --git a/defaults/main.yml b/defaults/main.yml
index 44f50e7..33cb2dd 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
-# defaults file for deploy_adguard
+# defaults file for deploy_gitea_runner
 deploy_gitea_runner_version: latest
-deploy_gitea_runner_deploy_method: docker # deployment method, either host or docker.
+deploy_gitea_runner_deploy_method: host # deployment method, either host or docker.
 deploy_gitea_runner_directory: /opt/gitea-actions
 deploy_gitea_runner_timezone: "Europe/Paris"
 deploy_gitea_runner_start_service: false
diff --git a/tasks/install_docker.yml b/tasks/install_docker.yml
new file mode 100644
index 0000000..db1e30c
--- /dev/null
+++ b/tasks/install_docker.yml
@@ -0,0 +1,2 @@
+---
+# task/install_docker file for deploy_gitea_runner
diff --git a/tasks/install_host.yml b/tasks/install_host.yml
index 6715efe..3c7d504 100644
--- a/tasks/install_host.yml
+++ b/tasks/install_host.yml
@@ -4,7 +4,7 @@
   vars:
     _gitea_actions_url_ext: "{% if deploy_gitea_runner_version == 'latest'%}releases{% else %}releases/tags{% endif %}"
   ansible.builtin.uri:
-    url: "{{ deploy_gitea_runner_gitea_api }}/{{ _docker_compose_url_ext }}/{{ install_docker_compose_version }}"
+    url: "{{ deploy_gitea_runner_gitea_api }}/{{ _gitea_actions_url_ext }}/{{ deploy_gitea_runner_version }}"
     return_content: true
   register: _gitea_runner_new_release
 
@@ -38,10 +38,10 @@
   when: deploy_gitea_runner_current_version is not defined
     or deploy_gitea_runner_wanted_version not in deploy_gitea_runner_current_version
   block:
-    - name: "Download and install gitea_runner version:{{ hashi_consul_envoy_version }}"
+    - name: "Download and install gitea_runner version:{{ deploy_gitea_runner_version }}"
       ansible.builtin.get_url:
-        url: "{{ deploy_gitea_runner_gitea_url }}/releases/download/v{{ deploy_gitea_runner_wanted_version }}/act_runner-{{ deploy_gitea_runner_wanted_version }}-linux-{{ deploy_gitea_runner_arch_map[ansible_distribution] }}"
-        dest: "{{ hashi_consul_envoy_path }}"
+        url: "{{ deploy_gitea_runner_gitea_url }}/releases/download/v{{ deploy_gitea_runner_wanted_version }}/act_runner-{{ deploy_gitea_runner_wanted_version }}-linux-{{ deploy_gitea_runner_arch_map[ansible_architecture] }}"
+        dest: "{{ deploy_gitea_runner_path }}"
         force: true
         owner: root
         group: root
diff --git a/tasks/main.yml b/tasks/main.yml
index 66ce02a..740d78d 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -5,3 +5,6 @@
 
 - name: "Import configure.yml"
   ansible.builtin.include_tasks: configure.yml
+
+- name: "Import install.yml"
+  ansible.builtin.include_tasks: "install_{{ deploy_gitea_runner_deploy_method }}.yml"