fix: binary filenames

they pure binaries not tgz files anymore
papanito · Oct 12, 2022 · 3196854 · 3196854
1 parent 7d2f60b
commit 3196854
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/tasks/install.yml b/tasks/install.yml
@@ -20,11 +20,10 @@
       path: "{{ daemon_location }}"
       checksum_algorithm: sha256
     register: stat_result
-  - name: Unarchive {{ cf_download_baseurl }}/{{ cf_binary_filename }} to {{ cf_install_target_dir }}
-    unarchive:
-      src: "{{ cf_download_baseurl }}/{{ cf_binary_filename }}"
-      dest: "{{ cf_install_target_dir }}"
-      remote_src: yes
+  - name: Download binary {{ cf_download_baseurl }}/{{ cf_binary_filename }} to {{ cf_install_target_dir }}
+    ansible.builtin.get_url:
+      url: "{{ cf_download_baseurl }}/{{ cf_binary_filename }}"
+      dest: "{{ cf_install_target_dir }}/cloudflared"
     when: not stat_result.stat.exists or cf_force_install
   - name: Ensure cloudflared is executable
     ansible.builtin.file:

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -3,7 +3,7 @@
 - name: Define required variables
   set_fact:
     daemon_location: "{{ cf_install_target_dir }}/cloudflared"
-    cf_binary_filename: "{{ cf_binaries[ansible_machine].filename_tgz }}"
+    cf_binary_filename: "{{ cf_binaries[ansible_machine].filename_bin }}"
     systemd_filename: "cloudflared"
   tags:
   - cf_cleanup

diff --git a/vars/main.yml b/vars/main.yml
@@ -5,19 +5,19 @@
 ## currently only linux bin, no deb or rpm
 cf_binaries:
   x86_64:
-    filename_tgz: cloudflared-linux-amd64.tgz
+    filename_bin: cloudflared-linux-amd64
     filename_deb: cloudflared-linux-amd64.deb
     filename_rpm: cloudflared-linux-amd64.rpm
   x86:
-    filename_tgz: cloudflared-linux-386.tgz
+    filename_bin: cloudflared-linux-386
     filename_deb: cloudflared-linux-386.deb
     filename_rpm: cloudflared-linux-386.rpm
   arm:
-    filename_tgz: cloudflared-linux-arm.tgz
+    filename_bin: cloudflared-linux-arm
     filename_deb: cloudflared-linux-arm.deb
     filename_rpm: cloudflared-linux-arm.rpm
   aarch64:
-    filename_tgz: cloudflared-linux-arm64.tgz
+    filename_bin: cloudflared-linux-arm64
     filename_deb: cloudflared-linux-arm64.deb
     filename_rpm: cloudflared-linux-arm64.rpm