diff --git a/playbooks/nodes/apps.yml b/playbooks/nodes/apps.yml index efbb0fe..c5d7153 100644 --- a/playbooks/nodes/apps.yml +++ b/playbooks/nodes/apps.yml @@ -3,9 +3,6 @@ hosts: apps become: true roles: - # - role: apps/kan - # vars: - # port: 7070 - role: apps/memos vars: port: 7071 @@ -21,21 +18,9 @@ - role: apps/stirling-pdf vars: port: 7075 - # - role: apps/dumbware-todo - # vars: - # port: 7076 - # pin: 8989 - role: apps/flowtodo vars: port: 7076 - - role: apps/filebrowser - vars: - port: 7078 - directory: "fb-file-sharing" - container_name: "filebrowser-sharing" - - role: apps/reubah - vars: - port: 7079 - role: apps/komga vars: port: 7080 @@ -66,10 +51,12 @@ vars: port: 7085 url: "https://tasks.thegrind.dev" - - role: apps/planka + - role: apps/filebrowser vars: - port: 7085 - url: "https://tasks.thegrind.dev" + container_name: "filebrowser-javi" + instance_name: "javi" + share: "javi" + port: 7086 tasks: - name: Personal DW drop ansible.builtin.include_role: diff --git a/playbooks/proxy/external.yml b/playbooks/proxy/external.yml index 59f8c6b..9683b3d 100644 --- a/playbooks/proxy/external.yml +++ b/playbooks/proxy/external.yml @@ -25,9 +25,6 @@ - name: "share" host: "{{ lookup('hostip', 'apps') }}" port: 7078 - - name: "convert" - host: "{{ lookup('hostip', 'apps') }}" - port: 7079 - name: "blinker.club" host: "{{ lookup('hostip', 'portainer_main') }}" port: 7575 @@ -36,9 +33,6 @@ - name: "pass" host: "{{ lookup('hostip', 'portainer_main') }}" port: 5004 - - name: "tables" - host: "{{ lookup('hostip', 'portainer_main') }}" - port: 5005 - name: "watch" host: "{{ lookup('hostip', 'streaming_services') }}" port: 5001 @@ -60,9 +54,6 @@ - name: "mediarequest" host: "{{ lookup('hostip', 'streaming_services') }}" port: 5002 - - name: "fileshare" - host: "{{ lookup('hostip', 'apps') }}" - port: 7073 - name: "books" host: "{{ lookup('hostip', 'apps') }}" port: 7080 @@ -100,4 +91,10 @@ port: 7085 - name: "docs" host: "{{ lookup('hostip', 'apps') }}" - port: 7083 \ No newline at end of file + port: 7083 + - name: "melab.fyi" + dynamic_dns: true + sites: + - name: "files" + host: "{{ lookup('hostip', 'apps') }}" + port: 7086 \ No newline at end of file diff --git a/roles/apps/filebrowser/tasks/main.yml b/roles/apps/filebrowser/tasks/main.yml index 095c86d..9fbe608 100644 --- a/roles/apps/filebrowser/tasks/main.yml +++ b/roles/apps/filebrowser/tasks/main.yml @@ -1,26 +1,23 @@ -- name: Mount the container data folder - ansible.builtin.include_role: - role: docker/container-data +- name: Set facts + ansible.builtin.set_fact: + data_path: "/home/docker/filebrowser-{{ instance_name }}-data" + +- name: Mount the data share to the VM + ansible.builtin.include_tasks: + file: ../tasks/mount_nfs.yml vars: - dir_name: "{{ directory }}" + mount_path: "{{ data_path }}" + mount_source: "{{ lookup('hostip', 'nas') }}:/mnt/main/{{ share }}" -- name: Create files folder +- name: Create subdirectories ansible.builtin.file: - dest: "/home/docker/container-data/{{ directory }}/files" - state: directory - mode: '0777' - -- name: Create config folder - ansible.builtin.file: - dest: "/home/docker/container-data/{{ directory }}/config" - state: directory - mode: '0777' - -- name: Create config folder - ansible.builtin.file: - dest: "/home/docker/container-data/{{ directory }}/database" + dest: "{{ data_path }}/{{ item }}" state: directory mode: '0777' + loop: + - files + - config + - database - name: Deploy filebrowser container community.docker.docker_container: @@ -32,6 +29,6 @@ ports: - '{{ port }}:80' volumes: - - '/home/docker/container-data/{{ directory }}/config:/config' - - '/home/docker/container-data/{{ directory }}/database:/database' - - '/home/docker/container-data/{{ directory }}/files:/srv' \ No newline at end of file + - "{{ data_path }}/config:/config" + - "{{ data_path }}/database:/database" + - "{{ data_path }}/files:/srv" \ No newline at end of file