build

all.yml

@@ -44,9 +44,9 @@
     - name: zabbix-agent
       role: zabbix-agent
       tags: zabbix-agent
-    - name: autofs_client
+    - name: autofs
-      role: autofs_client
+      role: autofs
-      tags: autofs_client
+      tags: autofs
     - name: ldap_client
       role: ldap_client
       tags: ldap_client

roles/autofs/tasks/main.yml

@@ -26,6 +26,9 @@
         content: |
           docker_data  -fstype=nfs   m-server.home.lan:/docker_data
           downloads  -fstype=nfs   m-server.home.lan:/downloads
+          movies  -fstype=nfs   m-server.home.lan:/movies
+          shows  -fstype=nfs   m-server.home.lan:/shows
+          music  -fstype=nfs   m-server.home.lan:/music
         mode: '0600'
         owner: root
         group: root
@@ -150,6 +153,7 @@
           shows --fstype=nfs,rw nas.home.lan:/shows
           xxx --fstype=nfs,rw nas.home.lan:/xxx
           proxmox --fstype=nfs,rw nas.home.lan:/proxmox
+          live --fstype=nfs,rw nas.home.lan:/live
         mode: '0600'
         owner: root
         group: root

roles/docker/tasks/main.yml

@@ -18,7 +18,10 @@
           - python3-dev
         state: present
         update_cache: true
-
+      register: install_docker_deps
+      until: install_docker_deps is succeeded
+      retries: 10
+      delay: 10
 
     - name: Get keys for raspotify
       ansible.builtin.command:
@@ -211,6 +214,7 @@
         path: /etc/systemd/system/docker.service.d/
         state: directory
         mode: '0755'
+
     - name: Create a directory for certs
       ansible.builtin.file:
         path: /etc/docker/certs
@@ -277,10 +281,14 @@
         path: /etc/docker/certs/ca.pem
       register: file_check
 
+    - name: Print file check result
+      ansible.builtin.debug:
+        var: file_check
+
     - name: Include role only if missing
       ansible.builtin.include_role:
         name: cert_gen
-      when: not file_check
+      when: not file_check.stat.exists and mode == "cert"
 
 
     - name: Create docker config file
@@ -293,12 +301,7 @@
               "max-size": "10m",
               "max-file": "3"
             },
-            "storage-driver": "overlay2",
+            "data-root": "/var/lib/docker",
-            "storage-opts": [
-              "overlay2.override_kernel_check=true"
-            ],
-            "data-root": "/var/lib/docker"
-            {
             "dns": ["192.168.77.101", "192.168.77.106", "8.8.8.8"],
             "dns-search": ["lan", "home.lan"]
 

roles/letsgo/tasks/main.yml

@@ -7,5 +7,6 @@
       loop_control:
         loop_var: roles_item
       loop:
-        - cert_gen
         - docker
+        - docker_swarm
+        - autofs

roles/nfs_server/tasks/main.yml

@@ -48,44 +48,65 @@
         fstype: none
       when: inventory_hostname != 'amd.home.lan'
 
-    - name: Reconfigure nfs fstab
+    - name: Reconfigure nfs exports
       ansible.builtin.lineinfile:
         path: /etc/fstab
-        regexp: "^/media/m-server/downloads .*"
+        regexp: "^/share/{{ volume }} .*"
-        line: "/media/m-server/downloads  /srv/nfs/downloads    none    bind    0       0"
+        line: "/media/m-server/{{ volume }}  /srv/nfs/{{ volume }}    none    bind    0       0"
       when: inventory_hostname == 'm-server.home.lan'
+      loop_control:
+        loop_var: volume
+      loop: 
+        - downloads
+        - music
+        - movies
+        - shows
 
     - name: Reconfigure nfs exports
       ansible.builtin.lineinfile:
         path: /etc/fstab
-        regexp: "^/share/docker_data .*"
+        regexp: "^/share/{{ volume }} .*"
-        line: "/share/docker_data  /srv/nfs/docker_data    none    bind    0       0"
+        line: "/share/{{ volume }}  /srv/nfs/{{ volume }}    none    bind    0       0"
       when: inventory_hostname == 'm-server.home.lan'
+      loop_control:
+        loop_var: volume
+      loop: 
+        - docker_data
 
     - name: Reconfigure nfs exports
       ansible.builtin.lineinfile:
         path: /etc/exports
         regexp: "^/srv/nfs .*"
-        line: "/srv/nfs         192.168.77.0/24(rw,sync,no_subtree_check,crossmnt,fsid=0)"
+        line: "/srv/nfs         192.168.77.0/24(rw,sync,no_subtree_check,crossmnt,fsid=0) 192.168.80.0/24(rw,sync,no_subtree_check,crossmnt,fsid=0)"
 
     - name: Reconfigure nfs exports
       ansible.builtin.lineinfile:
         path: /etc/exports
         regexp: "^/srv/nfs/docker_data .*"
-        line: "/srv/nfs/docker_data 192.168.77.0/24(rw,sync,no_subtree_check)"
+        line: "/srv/nfs/docker_data 192.168.77.0/24(rw,sync,no_subtree_check) 192.168.80.0/24(rw,sync,no_subtree_check)"
       when: inventory_hostname != 'amd.home.lan'
 
     - name: Reconfigure nfs exports
       ansible.builtin.lineinfile:
         path: /etc/exports
-        regexp: "^/srv/nfs/downloads .*"
+        regexp: "^/srv/nfs/{{ volume }} .*"
-        line: "/srv/nfs/downloads 192.168.77.0/24(rw,sync,no_subtree_check)"
+        line: "/srv/nfs/{{ volume }} 192.168.77.0/24(rw,sync,no_subtree_check) 192.168.80.0/24(rw,sync,no_subtree_check)"
       when: inventory_hostname == 'm-server.home.lan'
+      loop_control:
+        loop_var: volume
+      loop: 
+        - downloads
+        - music
+        - movies
+        - shows
+
+
+
     - name: Reconfigure nfs exports
       ansible.builtin.lineinfile:
         path: /etc/exports
         regexp: "^/srv/nfs/backup .*"
-        line: "/srv/nfs/backup 192.168.77.0/24(rw,sync,no_subtree_check)"
+        line: "/srv/nfs/backup 192.168.77.0/24(rw,sync,no_subtree_check) 192.168.80.0/24(rw,sync,no_subtree_check)"
       when: inventory_hostname == 'amd.home.lan'
     - name: Restart nfs service
       ansible.builtin.service:

roles/proxmox/tasks/main.yml

@@ -0,0 +1,127 @@
+- name: Omv Setup
+  become: "{{ false if inventory_hostname == 'nas.home.lan' else true }}"
+  block:
+    # - name: Gather facts
+    #   ansible.builtin.setup:
+    # - name: Print
+    #   ansible.builtin.debug:
+    #     msg: "{{ ansible_facts }}"
+    - name: Include vault
+      ansible.builtin.include_vars:
+        file: jaydee.yml
+        name: mysecrets
+      when: inventory_hostname != 'nas.home.lan'
+    - name: Delete content & directory
+      ansible.builtin.file:
+        state: absent
+        path: "{{ dest_folder }}"
+
+    - name: "Check if listed package is installed or not on Debian Linux family"
+      ansible.builtin.package:
+        name: "{{ item }}"
+        state: present
+      check_mode: true
+      loop:
+        - git
+      register: git_installed
+
+    - name: Include role only if missing
+      ansible.builtin.include_role:
+        name: git
+      when: not git_installed
+
+    - name: Pull repo
+      tags:
+        - git_pull
+      ansible.builtin.git:
+        repo: "https://{{ mysecrets['git_user'] | urlencode }}:{{ mysecrets['git_password_mqtt'] | urlencode }}@gitlab.sectorq.eu/jaydee/proxmox.git"
+        dest: "{{ dest_folder }}"
+        update: true
+        clone: true
+        version: main
+      when: inventory_hostname != 'nas.home.lan'
+    - name: Print
+      ansible.builtin.debug:
+        msg: "{{ inventory_hostname }}"
+    - name: Create a directory if it does not exist
+      ansible.builtin.file:
+        path: /myapps/proxmox
+        state: directory
+        mode: '0755'
+        owner: root
+        group: root
+      when: inventory_hostname != 'nas.home.lan'
+
+    - name: Upload script
+      ansible.builtin.copy:
+        src: "{{ dest_folder }}/proxmox.py"
+        dest: /myapps/proxmox/proxmox.py
+        remote_src: true
+        mode: '0755'
+        owner: root
+        group: root
+      when: inventory_hostname != 'nas.home.lan'
+    - name: Upload exclude file
+      ansible.builtin.copy:
+        src: "{{ dest_folder }}/exclude.txt"
+        dest: /myapps/exclude.txt
+        remote_src: true
+        mode: '0755'
+        owner: root
+        group: root
+      when: inventory_hostname != 'nas.home.lan'
+    - name: Upload requirements
+      ansible.builtin.copy:
+        src: "{{ dest_folder }}/requirements.txt"
+        dest: /myapps/requirements.txt
+        remote_src: true
+        mode: '0755'
+        owner: root
+        group: root
+      when: inventory_hostname != 'nas.home.lan'
+    - name: Upload docker_backups.py
+      ansible.builtin.copy:
+        src: "{{ dest_folder }}/docker_backups.py"
+        dest: /myapps/docker_backups.py
+        remote_src: true
+        mode: '0755'
+        owner: root
+        group: root
+      when: inventory_hostname == 'm-server.home.lan'
+    - name: Install venv
+      ansible.builtin.apt:
+        name:
+          - python3-virtualenv
+          - rsync
+
+    - name: Install specified python requirements in indicated (virtualenv)
+      ansible.builtin.pip:
+        requirements: /myapps/requirements.txt
+        virtualenv: /myapps/venv
+
+    - name: 'Ensure an old job is no longer present. Removes any job that is prefixed by "#Ansible: an old job" from the crontab'
+      ansible.builtin.cron:
+        name: "omv_backup"
+        state: absent
+    - name: Upload service config
+      ansible.builtin.copy:
+        src: omv_backup.service
+        dest: /etc/systemd/system/omv_backup.service
+        mode: '0755'
+        owner: root
+        group: root
+      when: inventory_hostname == 'amd.home.lan'
+    - name: Restart omv service
+      ansible.builtin.service:
+        name: omv_backup
+        state: restarted
+        daemon_reload: true
+        enabled: true
+      when: inventory_hostname == 'amd.home.lan'
+    # - name: Ensure a job that runs at 2 and 5 exists. Creates an entry like "0 5,2 * * ls -alh > /dev/null"
+    #   ansible.builtin.cron:
+    #     name: "omv_backup"
+    #     minute: "0"
+    #     hour: "8"
+    #     job: "sudo /myapps/omv_backup.py -b > /dev/null  2>&1 &"
+    #     state: present

roles/proxmox/vars/main.yml

@@ -0,0 +1 @@
+dest_folder: "/tmp/ans_repo"