diff --git a/ansible/linter.yaml b/ansible/linter.yaml index 12b3a33..05dd6a0 100644 --- a/ansible/linter.yaml +++ b/ansible/linter.yaml @@ -1,3 +1,4 @@ --- skip_list: - - role-name \ No newline at end of file + - role-name + - var-naming[no-role-prefix] \ No newline at end of file diff --git a/ansible/roles/services/tasks/main.yaml b/ansible/roles/services/tasks/main.yaml index b0f77f7..7c2d25e 100644 --- a/ansible/roles/services/tasks/main.yaml +++ b/ansible/roles/services/tasks/main.yaml @@ -1,16 +1,30 @@ - name: Ensure docker dir is present ansible.builtin.file: - path: "{{ docker_compose_dir }}" + path: "{{ services.compose_dir }}" state: directory mode: "0755" +- name: Collect id -u result + ansible.builtin.command: + cmd: id -u + register: id_u + changed_when: false +- name: Collect id -g result + ansible.builtin.command: + cmd: id -g + register: id_g + changed_when: false - name: Ensure compose.yaml is present + vars: + puid: "{{ id_u.stdout }}" + pgid: "{{ id_g.stdout }}" + health_port: "{{ services.health.port }}" ansible.builtin.template: src: compose.yaml - dest: "{{ docker_compose_dir }}/compose.yaml" + dest: "{{ services.compose_dir }}/compose.yaml" mode: "0644" - name: Apply docker compose with services community.docker.docker_compose_v2: - project_src: "{{ docker_compose_dir }}" + project_src: "{{ services.compose_dir }}" register: compose_output - name: Show output of docker compose apply ansible.builtin.debug: diff --git a/ansible/roles/services/templates/compose.yaml b/ansible/roles/services/templates/compose.yaml index 42d5259..9ac762d 100644 --- a/ansible/roles/services/templates/compose.yaml +++ b/ansible/roles/services/templates/compose.yaml @@ -3,4 +3,25 @@ services: container_name: health image: nginx:latest ports: - - "{{ docker_health_port }}:80" \ No newline at end of file + - "{{ health_port }}:80" + filebrowser: + container_name: filebrowser + image: filebrowser/filebrowser + volumes: + - filebrowser-data:/srv + - filebrowser-db:/database.db + environment: + PUID: "{{ puid }}" + PGID: "{{ pgid }}" + + +volumes: + filebrowser-data: + name: vol-filebrowser-data + driver: local + filebrowser-db: + name: vol-filebrowser-db + driver: local + filebrowser-cfg: + name: vol-filebrowser-cfg + driver: local \ No newline at end of file diff --git a/ansible/roles/services/vars/main.yaml b/ansible/roles/services/vars/main.yaml index 6ad6a46..9ea0305 100644 --- a/ansible/roles/services/vars/main.yaml +++ b/ansible/roles/services/vars/main.yaml @@ -1,2 +1,6 @@ -docker_compose_dir: /home/nigel/compose -docker_health_port: 8080 +services: + compose_dir: /home/nigel/compose + fb: + port: 8000 + health: + port: 8080