Merge pull request #16 from darkwizard242/feature/multi-arch-support

Support multiple Architectures | Remove support for Ubuntu 18.04 and EL platforms
darkwizard242 · Jul 1, 2024 · c1ac9f9 · c1ac9f9
2 parents b529fe7 + 5a1ce40
commit c1ac9f9
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 23 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -51,7 +51,7 @@ jobs:
     strategy:
       max-parallel: 10
       matrix:
-        IMAGE: [ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, ubuntu-18.04, rockylinux-8, centos-7, debian-bullseye, debian-buster]
+        IMAGE: [ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, debian-bullseye, debian-buster]
 
     steps:
 

diff --git a/README.md b/README.md
@@ -17,9 +17,17 @@ Available variables are listed below (located in `defaults/main.yml`):
 ```yaml
 subfinder_app: subfinder
 subfinder_version: 2.6.6
-subfinder_os: linux
-subfinder_arch: amd64
-subfinder_dl_url: "https://github.com/projectdiscovery/{{ subfinder_app }}/releases/download/v{{ subfinder_version }}/{{ subfinder_app }}_{{ subfinder_version }}_{{ subfinder_os}}_{{ subfinder_arch }}.tar.gz"
+subfinder_os: "{{ ansible_system | lower }}"
+subfinder_architecture_map:
+  amd64: amd64
+  arm: arm64
+  x86_64: amd64
+  armv6l: armv6
+  armv7l: armv7
+  aarch64: arm64
+  32-bit: "386"
+  64-bit: amd64
+subfinder_dl_url: "https://github.com/projectdiscovery/{{ subfinder_app }}/releases/download/v{{ subfinder_version }}/{{ subfinder_app }}_{{ subfinder_version }}_{{ subfinder_os}}_{{ subfinder_architecture_map[ansible_architecture] }}.zip"
 subfinder_bin_path: /usr/local/bin
 subfinder_file_owner: root
 subfinder_file_group: root
@@ -28,17 +36,17 @@ subfinder_file_mode: '0755'
 
 ### Variables table:
 
-Variable             | Description
--------------------- | -----------------------------------------------------------------------------------------------------------------------------------------------------------
-subfinder_app        | Defines the app to install i.e. **subfinder**
-subfinder_version    | Defined to dynamically fetch the desired version to install. Defaults to: **2.6.6**
-subfinder_os         | Defines os type. Used for obtaining the correct type of binaries based on OS type. Defaults to: **linux**
-subfinder_arch       | Defines os architecture. Used to set the correct type of binaries based on OS System Architecture. Defaults to: **amd64**
-subfinder_dl_url     | Defines URL to download the subfinder binary from.
-subfinder_bin_path   | Defined to dynamically set the appropriate path to store subfinder binary into. Defaults to (as generally available on any user's PATH): **/usr/local/bin**
-subfinder_file_owner | Owner for the binary file of subfinder.
-subfinder_file_group | Group for the binary file of subfinder.
-subfinder_file_mode  | Mode for the binary file of subfinder.
+Variable                   | Description
+-------------------------- | -----------------------------------------------------------------------------------------------------------------------------------------------------------
+subfinder_app              | Defines the app to install i.e. **subfinder**
+subfinder_version          | Defined to dynamically fetch the desired version to install. Defaults to: **2.6.6**
+subfinder_os               | Defines os type. Used for obtaining the correct type of binaries based on OS type.
+subfinder_architecture_map | Defines os architecture. Used to set the correct type of binaries based on OS System Architecture.
+subfinder_dl_url           | Defines URL to download the subfinder binary from.
+subfinder_bin_path         | Defined to dynamically set the appropriate path to store subfinder binary into. Defaults to (as generally available on any user's PATH): **/usr/local/bin**
+subfinder_file_owner       | Owner for the binary file of subfinder.
+subfinder_file_group       | Group for the binary file of subfinder.
+subfinder_file_mode        | Mode for the binary file of subfinder.
 
 ## Dependencies
 

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -3,9 +3,17 @@
 
 subfinder_app: subfinder
 subfinder_version: 2.6.6
-subfinder_os: linux
-subfinder_arch: amd64
-subfinder_dl_url: "https://github.com/projectdiscovery/{{ subfinder_app }}/releases/download/v{{ subfinder_version }}/{{ subfinder_app }}_{{ subfinder_version }}_{{ subfinder_os}}_{{ subfinder_arch }}.zip"
+subfinder_os: "{{ ansible_system | lower }}"
+subfinder_architecture_map:
+  amd64: amd64
+  arm: arm64
+  x86_64: amd64
+  armv6l: armv6
+  armv7l: armv7
+  aarch64: arm64
+  32-bit: "386"
+  64-bit: amd64
+subfinder_dl_url: "https://github.com/projectdiscovery/{{ subfinder_app }}/releases/download/v{{ subfinder_version }}/{{ subfinder_app }}_{{ subfinder_version }}_{{ subfinder_os}}_{{ subfinder_architecture_map[ansible_architecture] }}.zip"
 subfinder_bin_path: /usr/local/bin
 subfinder_file_owner: root
 subfinder_file_group: root

diff --git a/meta/main.yml b/meta/main.yml
@@ -13,15 +13,10 @@ galaxy_info:
         - noble
         - jammy
         - focal
-        - bionic
     - name: Debian
       versions:
         - bullseye
         - buster
-    - name: EL
-      versions:
-        - 8
-        - 7
 
   galaxy_tags:
     - subfinder