Merge pull request #56 from Oefenweb/add-install-method

Add install method

Author: tersmitten

.github/workflows/ci.yml

@@ -15,12 +15,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
 
       - name: Set up Python 3
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v6
         with:
-          python-version: '3.x'
+          python-version: '3 - 3.13'
 
       - name: Install test dependencies
         run: |
@@ -44,28 +44,29 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - distro: debian8
-          - distro: debian9
-          - distro: debian10
-          - distro: ubuntu1604
-            ansible-version: '>=2.10, <2.11'
-          - distro: ubuntu1604
+          - distro: debian11
+          - distro: debian12
           - distro: ubuntu1804
+            ansible-version: '>=9, <10'
           - distro: ubuntu2004
+            ansible-version: '>=12, <13'
+          - distro: ubuntu2204
+          - distro: ubuntu2404
 
     steps:
       - name: Check out the codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
         with:
           path: "${{ github.repository }}"
 
       - name: Set up Python 3
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v6
         with:
-          python-version: '3.x'
+          python-version: '3 - 3.13'
 
       - name: Install test dependencies
-        run: pip install 'ansible${{ matrix.ansible-version }}' molecule-plugins[docker] docker
+        run: |
+          pip install 'ansible${{ matrix.ansible-version }}' molecule-plugins[docker] docker
 
       - name: Run Molecule tests
         run: |

.github/workflows/release.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
 
       - name: Publish to Galaxy
         uses: robertdebock/galaxy-action@1.2.0

README.md

@@ -8,14 +8,17 @@ Set up the latest or a specific version of supervisor in Debian-like systems.
 #### Requirements
 
 * `python` (will be installed)
-* `pip` (will not installed)
+* `pip` (will not be installed)
+
+when using `supervisor_install_method: pip`
 
 #### Variables
 
-* `supervisor_python_version_major` [default: `2`]: Python version to install `supervisor` for.
-* `supervisor_python_version` [default: `supervisor_python_version`]: Deprecated
+* `supervisor_install_method`: [default: `native`]: The way to install supervisor (e.g. `native` (from Ubuntu repo) or `pip`)
+
+* `supervisor_pip_python_version_major` [default: `3`]: Python version to install `supervisor` for. Only relevant when using `supervisor_install_method: pip`
+* `supervisor_pip_package_version` [default: `latest`]: Supervisor version to install (e.g. `latest`, `3.3.1`). Only relevant when using `supervisor_install_method: pip`
 
-* `supervisor_version` [default: `latest`]: Supervisor version to install (e.g. `latest`, `3.3.1`)
 * `supervisor_unix_http_server_file` [default: `/var/run/supervisor.sock`]: A path to a UNIX domain socket (e.g. `/tmp/supervisord.sock`) on which supervisor will listen for HTTP/XML-RPC requests. `supervisorctl` uses XML-RPC to communicate with supervisord over this port
 * `supervisor_unix_http_server_chmod` [default: `'0700'`]: Change the UNIX permission mode bits of the UNIX domain socket to this value at startup
 * `supervisor_unix_http_server_chown` [optional]: The user and group of `supervisor_unix_http_server_file` file. Use the following format: `user:group`
@@ -25,7 +28,7 @@ Set up the latest or a specific version of supervisor in Debian-like systems.
 * `supervisor_system_user` [default: `root`]: Name of the user that should own the config file/directory
 * `supervisor_system_group` [default: `root`]: Name of the group that should own the config file/directory
 
-* `supervisor_inet_http_server_enabled` [default: `false`]: Whether or not to enable the HTTP server
+* `supervisor_inet_http_server_enabled` [default: `false`]: Whether to enable the HTTP server
 * `supervisor_inet_http_server_port` [default: `9001`]: A TCP host:port value or (e.g. `127.0.0.1:9001`) on which supervisor will listen for HTTP/XML-RPC requests. `supervisorctl` will use XML-RPC to communicate with supervisord over this port
 * `supervisor_inet_http_server_username` [default: `admin`]: The username required for authentication to this HTTP server **Make sure to change!**
 * `supervisor_inet_http_server_password` [default: `'4ubA&Et=ASPe'`]: The password required for authentication to this HTTP server. This can be a cleartext password, or can be specified as a SHA-1 hash if prefixed by the string `{SHA}` **Make sure to change!**

Vagrantfile

@@ -4,13 +4,6 @@
 role = File.basename(File.expand_path(File.dirname(__FILE__)))
 
 boxes = [
-  {
-    :name => "ubuntu-1604",
-    :box => "bento/ubuntu-16.04",
-    :ip => '10.0.0.12',
-    :cpu => "50",
-    :ram => "256"
-  },
   {
     :name => "ubuntu-1804",
     :box => "bento/ubuntu-18.04",
@@ -23,28 +16,35 @@ boxes = [
     :box => "bento/ubuntu-20.04",
     :ip => '10.0.0.14',
     :cpu => "50",
-    :ram => "384"
+    :ram => "512"
   },
   {
-    :name => "debian-8",
-    :box => "bento/debian-8",
+    :name => "ubuntu-2204",
+    :box => "bento/ubuntu-22.04",
+    :ip => '10.0.0.15',
+    :cpu => "50",
+    :ram => "768"
+  },
+  {
+    :name => "ubuntu-2404",
+    :box => "bento/ubuntu-24.04",
     :ip => '10.0.0.16',
     :cpu => "50",
-    :ram => "256"
+    :ram => "768"
   },
   {
-    :name => "debian-9",
-    :box => "bento/debian-9",
-    :ip => '10.0.0.17',
+    :name => "debian-11",
+    :box => "bento/debian-11",
+    :ip => '10.0.0.19',
     :cpu => "50",
     :ram => "256"
   },
   {
-    :name => "debian-10",
-    :box => "bento/debian-10",
-    :ip => '10.0.0.18',
+    :name => "debian-12",
+    :box => "bento/debian-12",
+    :ip => '10.0.0.20',
     :cpu => "50",
-    :ram => "256"
+    :ram => "384"
   },
 ]
 

defaults/main.yml

@@ -1,12 +1,10 @@
 # defaults file
 ---
-supervisor_python_version_major: 2
-supervisor_python_version: "{{ supervisor_python_version_major }}"
+supervisor_install_method: native
 
-supervisor_dependencies:
-  - "python{{ supervisor_python_version_major is version('3', '>=') | ternary('3', '') }}"
+supervisor_pip_python_version_major: 3
+supervisor_pip_package_version: latest
 
-supervisor_version: latest
 supervisor_unix_http_server_file: /var/run/supervisor.sock
 supervisor_unix_http_server_chmod: '0700'
 

handlers/main.yml

@@ -2,6 +2,6 @@
 ---
 - name: restart supervisor
   ansible.builtin.service:
-    name: supervisor
+    name: "{{ supervisor_package_name }}"
     state: restarted
   when: service_default_state | default('started') == 'started'

meta/main.yml

@@ -11,14 +11,14 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
-        - xenial
         - bionic
         - focal
+        - jammy
+        - noble
     - name: Debian
       versions:
-        - jessie
-        - stretch
-        - buster
+        - bullseye
+        - bookworm
   galaxy_tags:
     - web
     - system

molecule/default/collections.yml

@@ -1,6 +1,2 @@
 ---
-collections:
-  - name: community.docker
-    version: '>=1.2.0,<2'
-  - name: community.general
-    version: '>=2,<3'
+collections: []

molecule/default/prepare.yml

@@ -13,3 +13,4 @@
       ansible.builtin.include_vars: "{{ playbook_dir }}/../../vars/main.yml"
     - name: include tasks
       ansible.builtin.import_tasks: "{{ playbook_dir }}/../../tests/tasks/pre.yml"
+      when: supervisor_install_method == 'pip'

tasks/install-native.yml

@@ -0,0 +1,10 @@
+# tasks file
+---
+- name: install | native | dependencies
+  ansible.builtin.apt:
+    name: "{{ supervisor_native_dependencies }}"
+    state: "{{ apt_install_state | default('latest') }}"
+    update_cache: true
+    cache_valid_time: "{{ apt_update_cache_valid_time | default(3600) }}"
+  tags:
+    - supervisor-install-native-dependencies