diff --git a/mediaserver.yml b/mediaserver.yml index 3ceba5d2..c8218178 100755 --- a/mediaserver.yml +++ b/mediaserver.yml @@ -1,5 +1,5 @@ --- -- hosts: 192.168.178.205 +- hosts: 192.168.178.200 become: true roles: - common diff --git a/roles/mediaserver/files/dashy_config.yml b/roles/mediaserver/files/dashy_config.yml index 5661e323..c4999d6c 100755 --- a/roles/mediaserver/files/dashy_config.yml +++ b/roles/mediaserver/files/dashy_config.yml @@ -79,11 +79,16 @@ sections: url: http://192.168.178.200:8080 target: newtab id: 4_1143_sabnzbd + - title: bazarr + icon: favicon + url: http://192.168.178.200:6767 + target: newtab + id: 5_1143_bazarr - title: Jellyfin icon: favicon url: http://192.168.178.200:8096 target: newtab - id: 5_1143_jellyfin + id: 6_1143_jellyfin displayData: sortBy: default rows: 1 diff --git a/roles/mediaserver/tasks/main.yml b/roles/mediaserver/tasks/main.yml index ccb535ae..d9d31bd9 100755 --- a/roles/mediaserver/tasks/main.yml +++ b/roles/mediaserver/tasks/main.yml @@ -12,12 +12,12 @@ block: - name: somerepo |no apt key ansible.builtin.get_url: - url: "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${{ ansible_distribution_version }}/Release.key" + url: "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_{{ ansible_distribution_version }}/Release.key" dest: /etc/apt/trusted.gpg.d/podman.asc - name: somerepo | apt source ansible.builtin.apt_repository: - repo: "deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/podman.asc] https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_${{ ansible_distribution_version }}/ /" + repo: "deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/podman.asc] https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_{{ ansible_distribution_version }}/ /" state: present - name: Install mediaserver packages @@ -28,7 +28,7 @@ loop: - python3-docker - podman - - podman-plugins + #- podman-plugins - name: Install pip docker-compose pip: diff --git a/roles/mediaserver/templates/docker-compose.yaml.j2 b/roles/mediaserver/templates/docker-compose.yaml.j2 index a92ad560..aeae44a5 100755 --- a/roles/mediaserver/templates/docker-compose.yaml.j2 +++ b/roles/mediaserver/templates/docker-compose.yaml.j2 @@ -17,7 +17,7 @@ services: environment: - VPN_ENABLED=yes - VPN_USER={{ VPN_USER }} - - VPN_PASS={{ VPN_PW }} + - VPN_PASS={{ VPN_PASS }} - VPN_PROV=pia - VPN_CLIENT=openvpn - STRICT_PORT_FORWARD=yes diff --git a/roles/mediaserver/vars/main.yml b/roles/mediaserver/vars/main.yml index e3b130a2..206d31ef 100755 --- a/roles/mediaserver/vars/main.yml +++ b/roles/mediaserver/vars/main.yml @@ -1,4 +1,8 @@ --- VPN_USER: "p3754227" VPN_PASS: "xsZtFdAofY" +NFS_MOUNTS: + - 192.168.178.201:/mnt/main/martin /mnt/nfs/martin nfs defaults 0 0 + - 192.168.178.201:/mnt/main/backups /mnt/nfs/backup nfs defaults 0 0 + - 192.168.178.201:/mnt/main/martin/transcodes/transcodes /opt/docker/mediaserver/jelly_config/data/transcodes nfs defaults 0 0 ... diff --git a/test.yml b/test.yml index f7a10fb6..47d3a91e 100755 --- a/test.yml +++ b/test.yml @@ -1,8 +1,54 @@ --- -- hosts: all - become: true +- hosts: localhost + gather_facts: no + + vars: + demo_list: + - ip: 1.2.3.4 + id: 1 + name: demo1 + - ip: 2.2.3.4 + id: 2 + name: demo2 + - ip: 3.2.3.4 + id: 3 + name: demo3 + + user_list: + - name: erika + comment: "bla" + id: 1001 + - name: max + id: 1002 + comment: "jo" + shell: /bin/false + tasks: - - name: echo - command: "echo 'Hello World'" - - name: uptime - command: "uptime" + - name: the list + debug: + msg: "{{ user_list }}" + - name: names + debug: + msg: "{{ item.name }} + {{ item.id }} + {{ item.shell | default('/bin/bash') }}" + loop: + "{{ user_list }}" + + + + # - name: the list + # debug: + # msg: "{{ demo_list }}" + + #- name: unflattened list + # debug: + # msg: "{{ item.id }} {{ item.ip }} {{ item.name }}" + #msg: "{{ item.name }}" + # loop: + #"{{ demo_list }}" + + #- name: flattened list == unflattened list in this case + # debug: + # msg: "{{ item.id }} {{ item.ip }} {{ item.name }}" + # loop: + # "{{ demo_list | flatten(levels=1) }}" +...