galaxy.yml

@@ -1,22 +1,14 @@
 namespace: finallycoffee
 name: base
-version: 0.1.2
+version: 0.1.1
 readme: README.md
 authors:
 - transcaffeine <transcaffeine@finally.coffee>
 description: Roles for base services which are common dependencies other services like databases
 dependencies:
-  "community.docker": "^3.0.0"
+  "community.docker": "^1.10.0"
 license_file: LICENSE.md
 build_ignore:
 - '*.tar.gz'
 repository: https://git.finally.coffee/finallycoffee/base
-issues: https://codeberg.org/finallycoffee/ansible-collection-base/issues
+issues: https://git.finally.coffee/finallycoffee/base/issues
-tags:
-  - docker
-  - elastic
-  - lego
-  - mariadb
-  - minio
-  - nginx
-  - restic

roles/nginx/README.md

@@ -26,8 +26,3 @@ For exposing this server to the host and/or internet, the `nginx_container_ports
 from host to container), `nginx_container_networks` (docker networking) or `nginx_container_labels`
 (for label-based routing discovery like traefik) can be used. The options correspond to the arguments
 of the `community.docker.docker_container` module.
-
-## Deployment methods
-
-Set `nginx_deployment_method` to either `docker` or `podman` to use the respective ansible modules for
-creating and managing the container and its image. See all supported methods in `nginx_deployment_methods`.

roles/nginx/defaults/main.yml

@@ -1,10 +1,9 @@
 ---
-nginx_version: "1.27.2"
+
+nginx_version: "1.26.2"
 nginx_flavour: alpine
 nginx_base_path: /opt/nginx
 nginx_config_file: "{{ nginx_base_path }}/nginx.conf"
-nginx_state: present
-nginx_deployment_method: docker
 
 nginx_container_name: nginx
 nginx_container_image_reference: >-
@@ -27,9 +26,6 @@ nginx_container_image_repository: >-
 nginx_container_image_registry: "docker.io"
 nginx_container_image_name: "nginx"
 nginx_container_image_tag: ~
-nginx_container_image_source: pull
-nginx_container_state: >-2
-  {{ (nginx_state == 'present') | ternary('started', 'absent') }}
 
 nginx_container_restart_policy: "unless-stopped"
 nginx_container_volumes:

roles/nginx/meta/main.yml

@@ -1,12 +0,0 @@
----
-allow_duplicates: true
-dependencies: []
-galaxy_info:
-  role_name: nginx
-  description: Deploy nginx, a webserver
-  galaxy_tags:
-    - nginx
-    - http
-    - webserver
-    - docker
-    - podman

roles/nginx/tasks/deploy-docker.yml

@@ -1,28 +0,0 @@
----
-- name: Ensure docker container image '{{ nginx_container_image_reference }}' is {{ nginx_state }}
-  community.docker.docker_image:
-    name: "{{ nginx_container_image_reference }}"
-    state: "{{ nginx_state }}"
-    source: "{{ nginx_container_image_source }}"
-    force_source: >-2
-      {{ nginx_container_image_force_source
-        | default(nginx_container_image_tag | default(false, true)) }}
-  register: nginx_container_image_info
-  until: nginx_container_image_info is success
-  retries: 5
-  delay: 3
-
-- name: Ensure docker container '{{ nginx_container_name }}' is {{ nginx_container_state }}
-  community.docker.docker_container:
-    name: "{{ nginx_container_name }}"
-    image: "{{ nginx_container_image_reference }}"
-    env: "{{ nginx_container_env | default(omit, true) }}"
-    user: "{{ nginx_container_user | default(omit, true) }}"
-    ports: "{{ nginx_container_ports | default(omit, true) }}"
-    labels: "{{ nginx_container_labels | default(omit, true) }}"
-    volumes: "{{ nginx_container_volumes | default(omit, true) }}"
-    etc_hosts: "{{ nginx_container_etc_hosts | default(omit, true) }}"
-    networks: "{{ nginx_container_networks | default(omit, true) }}"
-    purge_networks: "{{ nginx_container_purge_networks | default(omit, true) }}"
-    restart_policy: "{{ nginx_container_restart_policy }}"
-    state: "{{ nginx_container_state }}"

roles/nginx/tasks/deploy-podman.yml

@@ -1,27 +0,0 @@
----
-- name: Ensure container image '{{ nginx_container_image_reference }}' is {{ nginx_state }}
-  containers.podman.podman_image:
-    name: "{{ nginx_container_image_reference }}"
-    state: "{{ nginx_state }}"
-    pull: "{{ nginx_container_image_source == 'pull' }}"
-    force: >-2
-      {{ nginx_container_image_force_source
-        | default(nginx_container_image_tag | default(false, true)) }}
-  register: nginx_container_image_info
-  until: nginx_container_image_info is success
-  retries: 5
-  delay: 3
-
-- name: Ensure container '{{ nginx_container_name }}' is {{ nginx_container_state }}
-  containers.podman.podman_container:
-    name: "{{ nginx_container_name }}"
-    image: "{{ nginx_container_image_reference }}"
-    env: "{{ nginx_container_env | default(omit, true) }}"
-    user: "{{ nginx_container_user | default(omit, true) }}"
-    ports: "{{ nginx_container_ports | default(omit, true) }}"
-    labels: "{{ nginx_container_labels | default(omit, true) }}"
-    volumes: "{{ nginx_container_volumes | default(omit, true) }}"
-    etc_hosts: "{{ nginx_container_etc_hosts | default(omit, true) }}"
-    network: "{{ nginx_container_networks | default(omit, true) }}"
-    restart_policy: "{{ nginx_container_restart_policy }}"
-    state: "{{ nginx_container_state }}"

roles/nginx/tasks/main.yml

@@ -1,30 +1,10 @@
 ---
-- name: Check if state is supported
-  ansible.builtin.fail:
-    msg: >-2
-      Unsupported state '{{ nginx_state }}'. Supported
-      states are {{ nginx_states | join(', ') }}.
-  when: nginx_state not in nginx_states
 
-- name: Check if deployment_method is supported
+- name: Ensure base path '{{ nginx_base_path }}' exists
-  ansible.builtin.fail:
-    msg: >-2
-      Unsupported state '{{ nginx_deployment_method }}'. Supported
-      states are {{ nginx_deployment_methods | join(', ') }}.
-  when: nginx_deployment_method not in nginx_deployment_methods
-
-- name: Ensure nginx config file is {{ nginx_state }}
-  ansible.builtin.file:
-    path: "{{ nginx_config_file }}"
-    state: "{{ nginx_state }}"
-  when: nginx_state == 'absent'
-
-- name: Ensure base path '{{ nginx_base_path }}' is {{ nginx_state }}
   ansible.builtin.file:
     path: "{{ nginx_base_path }}"
-    mode: "0755"
+    state: directory
-    state: >-2
+    mode: 0755
-      {{ (nginx_state == 'present') | ternary('directory', 'absent') }}
 
 - name: Ensure nginx config file is templated
   ansible.builtin.copy:
@@ -33,8 +13,25 @@
     mode: 0640
   notify:
     - restart-nginx
-  when: nginx_state == 'present'
 
-- name: Deploy using {{ nginx_deployment_method }}
+- name: Ensure docker container image is present
-  ansible.builtin.include_tasks:
+  community.docker.docker_image:
-    file: "deploy-{{ nginx_deployment_method }}.yml"
+    name: "{{ nginx_container_image_reference }}"
+    state: present
+    source: pull
+    force_source: "{{ nginx_container_image_tag is defined and nginx_container_image_tag | string != '' }}"
+
+- name: Ensure docker container '{{ nginx_container_name }}' is running
+  community.docker.docker_container:
+    name: "{{ nginx_container_name }}"
+    image: "{{ nginx_container_image_reference }}"
+    env: "{{ nginx_container_env | default(omit, true) }}"
+    user: "{{ nginx_container_user | default(omit, true) }}"
+    ports: "{{ nginx_container_ports | default(omit, true) }}"
+    labels: "{{ nginx_container_labels | default(omit, true) }}"
+    volumes: "{{ nginx_container_volumes | default(omit, true) }}"
+    etc_hosts: "{{ nginx_container_etc_hosts | default(omit, true) }}"
+    networks: "{{ nginx_container_networks | default(omit, true) }}"
+    purge_networks: "{{ nginx_container_purge_networks | default(omit, true) }}"
+    restart_policy: "{{ nginx_container_restart_policy }}"
+    state: started

roles/nginx/vars/main.yml

@@ -1,7 +0,0 @@
----
-nginx_states:
-  - present
-  - absent
-nginx_deployment_methods:
-  - docker
-  - podman