From e4bdd81823be33c6f998721a4021c1ff8f722789 Mon Sep 17 00:00:00 2001 From: Thomas Kleinendorst Date: Tue, 19 Nov 2024 13:48:23 +0100 Subject: [PATCH] Simplify the actual role by using Docker --- roles/actual/tasks/main.yml | 35 +++++++++-------------- roles/actual/vars/main/defaults.yml | 1 - roles/actual/vars/main/vault.yml | 8 ------ roles/simple-reverse-proxy/tasks/main.yml | 7 ----- 4 files changed, 14 insertions(+), 37 deletions(-) delete mode 100644 roles/actual/vars/main/vault.yml diff --git a/roles/actual/tasks/main.yml b/roles/actual/tasks/main.yml index 7e7f30e..d68d690 100644 --- a/roles/actual/tasks/main.yml +++ b/roles/actual/tasks/main.yml @@ -1,25 +1,18 @@ --- -- name: Include user role - ansible.builtin.include_role: - name: user - vars: - user_username: "{{ actual_username }}" - user_password: "{{ actual_password }}" -- name: Create the actual container - ansible.builtin.include_role: - name: podman-container - apply: - become: true - become_user: "{{ actual_username }}" - vars: - podman_container_name: actual-server - podman_container_image: docker.io/actualbudget/actual-server - podman_container_tag: "{{ actual_version }}" - podman_container_publish: - - 127.0.0.1:5006:5006 - podman_simple_container_volumes: - - name: actual_data - mnt: /data +- name: Create a volume + become: true + community.docker.docker_volume: + name: actual_data +- name: Install the container + become: true + community.docker.docker_container: + name: actual-server + image: "docker.io/actualbudget/actual-server:{{ actual_version }}" + ports: + - "127.0.0.1:5006:5006/tcp" + mounts: + - source: actual_data + target: /data - name: Include simple-reverse-proxy role ansible.builtin.include_role: name: simple-reverse-proxy diff --git a/roles/actual/vars/main/defaults.yml b/roles/actual/vars/main/defaults.yml index 5300ff1..b7e154c 100644 --- a/roles/actual/vars/main/defaults.yml +++ b/roles/actual/vars/main/defaults.yml @@ -1,3 +1,2 @@ --- -actual_username: actual actual_version: 24.11.0 diff --git a/roles/actual/vars/main/vault.yml b/roles/actual/vars/main/vault.yml deleted file mode 100644 index 2734add..0000000 --- a/roles/actual/vars/main/vault.yml +++ /dev/null @@ -1,8 +0,0 @@ -$ANSIBLE_VAULT;1.1;AES256 -33376134646463343235646461303131626139663865333436646535383064383437616231323334 -6162306132343165666134323966363739333638353332620a663034326361383233356639646463 -65386537303530363335363234636464626330343864363162626233613430633430643334396636 -6635653735633730310a343036363136333933653561663839613238336338633061613534326536 -39343563343863643636616130316235316236656531626433613432303561383834333764336534 -35636438613832643433346135623934323964346464383931353539633464333038626561643963 -633839343438623261343239613534393233 diff --git a/roles/simple-reverse-proxy/tasks/main.yml b/roles/simple-reverse-proxy/tasks/main.yml index d27113f..b93509a 100644 --- a/roles/simple-reverse-proxy/tasks/main.yml +++ b/roles/simple-reverse-proxy/tasks/main.yml @@ -11,13 +11,6 @@ dest: "/etc/nginx/conf.d/{{ simple_reverse_proxy_internal_subdomain }}.conf" mode: '0644' notify: Restart Nginx -# - name: Allow https through firewall -# become: true -# community.general.ufw: -# rule: allow -# port: https -# proto: tcp -# notify: Restart ufw - name: Debug ansible.builtin.debug: msg: >-