diff --git a/.drone.yml b/.drone.yml index 9b28eb4e06..10a09eb4cd 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,6 +14,6 @@ steps: - name: lint image: python:3 commands: - - pip3 install ansible yamllint==1.27.1 ansible-lint==6.5 + - pip3 install ansible yamllint==1.35.1 ansible-lint==24.2.0 - ansible-lint nas.yml - yamllint . diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee36171e9c..e9908de26d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,12 +21,12 @@ jobs: uses: actions/checkout@v4 - name: Set up Python 3 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.x" - name: Install test dependencies - run: pip3 install ansible yamllint==1.30.0 ansible-lint==6.14.6 + run: pip3 install ansible yamllint==1.35.1 ansible-lint==24.2.0 - name: Ansible-lint run: ansible-lint nas.yml @@ -35,6 +35,6 @@ jobs: run: yamllint . - name: Lint docs - uses: articulate/actions-markdownlint@v1 + uses: articulate/actions-markdownlint@main with: version: 0.32.2 diff --git a/.github/workflows/docs-deploy.yml b/.github/workflows/docs-deploy.yml index 6eacd451fe..771815ee94 100644 --- a/.github/workflows/docs-deploy.yml +++ b/.github/workflows/docs-deploy.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Lint docs - uses: articulate/actions-markdownlint@v1 + uses: articulate/actions-markdownlint@main with: version: 0.32.2 diff --git a/.github/workflows/docs-test.yml b/.github/workflows/docs-test.yml index 6aa6baba13..c25d8f1547 100644 --- a/.github/workflows/docs-test.yml +++ b/.github/workflows/docs-test.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Lint docs - uses: articulate/actions-markdownlint@v1 + uses: articulate/actions-markdownlint@main with: version: 0.32.2 diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 646242b141..ce127978d2 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -26,14 +26,14 @@ jobs: needs: generate-matrix runs-on: ubuntu-latest strategy: - matrix: - role: ${{ fromJson(needs.generate-matrix.outputs.matrix) }} + matrix: + role: ${{ fromJson(needs.generate-matrix.outputs.matrix) }} steps: - uses: actions/checkout@v4 - name: Molecule Test - uses: gofrolist/molecule-action@dfbfd1af6a77523c8a937a1532f92808065a00a4 + uses: gofrolist/molecule-action@v2 with: - molecule_options: --base-config ../../tests/molecule/base.yml + molecule_options: --debug --base-config ../../tests/molecule/base.yml molecule_command: test molecule_working_dir: ${{ matrix.role }} env: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a4a640a8ed..412cdb851e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,14 +1,14 @@ --- repos: - repo: https://github.com/ansible-community/ansible-lint.git - rev: v6.14.6 + rev: v24.2.0 hooks: - id: ansible-lint - repo: https://github.com/adrienverge/yamllint.git - rev: v1.30.0 + rev: v1.35.1 hooks: - id: yamllint - repo: https://github.com/igorshubovych/markdownlint-cli - rev: v0.32.2 + rev: v0.39.0 hooks: - id: markdownlint diff --git a/requirements-dev.txt b/requirements-dev.txt index 6ed693e439..99983d1046 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,5 +1,5 @@ pre-commit -molecule==4.0.1 -molecule[docker]==4.0.1 -pytest>=7.0.0 +molecule==24.2.0 +molecule-plugins[docker]==23.5.3 +pytest>=8.0.1 pytest_molecule>=2.0.0 \ No newline at end of file diff --git a/requirements.yml b/requirements.yml index ada37edf60..dcd6df6bde 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,7 +1,7 @@ --- roles: - name: geerlingguy.docker - version: 6.0.0 + version: 7.1.0 - name: geerlingguy.docker_arm version: 5.0.0 @@ -16,9 +16,10 @@ roles: - name: tigattack.mergerfs - - name: arillso.restic + - name: andrewrothstein.restic collections: - name: ansible.posix - name: community.docker - name: community.general + - name: community.windows diff --git a/roles/activepieces/requirements.yml b/roles/activepieces/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/activepieces/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/admidio/defaults/main.yml b/roles/admidio/defaults/main.yml index 82be9fbb20..4c30e3c3ee 100644 --- a/roles/admidio/defaults/main.yml +++ b/roles/admidio/defaults/main.yml @@ -18,7 +18,7 @@ admidio_mysql_memory: 1g admidio_container_name: admidio admidio_mysql_container_name: admidio-db admidio_image_name: "admidio/admidio" -admidio_image_version: "v4.2.4" +admidio_image_version: "latest" admidio_mysql_image_name: "mariadb" admidio_mysql_image_version: latest admidio_user_id: "1000" diff --git a/roles/admidio/requirements.yml b/roles/admidio/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/admidio/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/airsonic/requirements.yml b/roles/airsonic/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/airsonic/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/authelia/requirements.yml b/roles/authelia/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/authelia/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/authentik/requirements.yml b/roles/authentik/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/authentik/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/barcodebuddy/requirements.yml b/roles/barcodebuddy/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/barcodebuddy/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/bazarr/requirements.yml b/roles/bazarr/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/bazarr/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/beets/requirements.yml b/roles/beets/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/beets/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/blaze/requirements.yml b/roles/blaze/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/blaze/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/blocky/molecule/default/molecule.yml b/roles/blocky/molecule/default/molecule.yml index 83765a4d6f..97938372ab 100644 --- a/roles/blocky/molecule/default/molecule.yml +++ b/roles/blocky/molecule/default/molecule.yml @@ -5,6 +5,8 @@ provisioner: all: blocky_enabled: true blocky_data_directory: "/tmp" + blocky_dns_tcp_port: "8853" + blocky_dns_udp_port: "8853" platforms: - name: instance image: geerlingguy/docker-ubuntu2204-ansible:latest diff --git a/roles/blocky/requirements.yml b/roles/blocky/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/blocky/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/booksonic/requirements.yml b/roles/booksonic/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/booksonic/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/calibre/requirements.yml b/roles/calibre/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/calibre/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/changedetection/requirements.yml b/roles/changedetection/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/changedetection/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/chatpad/requirements.yml b/roles/chatpad/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/chatpad/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/claper/requirements.yml b/roles/claper/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/claper/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/cloudcmd/requirements.yml b/roles/cloudcmd/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/cloudcmd/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/cloudflare_ddns/defaults/main.yml b/roles/cloudflare_ddns/defaults/main.yml index a4849f96e6..751894c5e8 100644 --- a/roles/cloudflare_ddns/defaults/main.yml +++ b/roles/cloudflare_ddns/defaults/main.yml @@ -2,28 +2,28 @@ cloudflare_ddns_enabled: false # Data directory for config file -cloudflare_data_directory: "{{ docker_home }}/cloudflare_ddns" +cloudflare_ddns_data_directory: "{{ docker_home }}/cloudflare_ddns" # Your domain name -cloudflare_zone: "{{ ansible_nas_domain }}" +cloudflare_ddns_zone: "{{ ansible_nas_domain }}" # The hostname you want the container to update. You shouldn't need to change this. -cloudflare_host: "*.{{ cloudflare_zone }}" +cloudflare_ddns_host: "*.{{ cloudflare_ddns_zone }}" # Cloudflare scoped token (https://github.com/joshuaavalon/docker-cloudflare#api-token) # Make sure token permissions include #DNS:Edit and #Zone:Read -cloudflare_token: "abcdabcdabcd123412341234" +cloudflare_ddns_token: "abcdabcdabcd123412341234" # Set to true to make traffic go through the CloudFlare CDN. # Note that if the cloudflare host is a wildcard (the default), this must be false, as cloudflare # does not support http proxy of wildcard CNAMEs. -cloudflare_proxy: false +cloudflare_ddns_proxy: false # Set to AAAA to use set IPv6 records instead of IPv4 records. -cloudflare_type: "A" +cloudflare_ddns_type: "A" # specs -cloudflare_memory: 512MB +cloudflare_ddns_memory: 512MB # docker -cloudflare_container_name: cloudflare-ddns +cloudflare_ddns_container_name: cloudflare-ddns diff --git a/roles/cloudflare_ddns/molecule/default/verify.yml b/roles/cloudflare_ddns/molecule/default/verify.yml index 8878adb72f..6353f1ee43 100644 --- a/roles/cloudflare_ddns/molecule/default/verify.yml +++ b/roles/cloudflare_ddns/molecule/default/verify.yml @@ -9,7 +9,7 @@ - name: Get container state community.docker.docker_container_info: - name: "{{ cloudflare_container_name }}" + name: "{{ cloudflare_ddns_container_name }}" register: result - name: Check Cloudflare DDNS is running diff --git a/roles/cloudflare_ddns/molecule/default/verify_stopped.yml b/roles/cloudflare_ddns/molecule/default/verify_stopped.yml index bc012f4e70..411921cf78 100644 --- a/roles/cloudflare_ddns/molecule/default/verify_stopped.yml +++ b/roles/cloudflare_ddns/molecule/default/verify_stopped.yml @@ -9,7 +9,7 @@ - name: Try and stop and remove Cloudflare DDNS community.docker.docker_container: - name: "{{ cloudflare_container_name }}" + name: "{{ cloudflare_ddns_container_name }}" state: absent register: result diff --git a/roles/cloudflare_ddns/requirements.yml b/roles/cloudflare_ddns/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/cloudflare_ddns/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/cloudflare_ddns/tasks/main.yml b/roles/cloudflare_ddns/tasks/main.yml index ad8a18a7e9..001af26bb3 100644 --- a/roles/cloudflare_ddns/tasks/main.yml +++ b/roles/cloudflare_ddns/tasks/main.yml @@ -4,28 +4,28 @@ - name: Check for deprecated API key ansible.builtin.fail: msg: "Using a Cloudflare global API key is no longer supported. Please unset cloudflare_api_key and set cloudflare_token" - when: cloudflare_api_key is defined + when: cloudflare_ddns_api_key is defined - name: Create cloudflare Dynamic DNS Directories ansible.builtin.file: - path: "{{ cloudflare_data_directory }}" + path: "{{ cloudflare_ddns_data_directory }}" state: directory - name: Template Cloudflare Dynamic DNS config.yml with scoped token ansible.builtin.template: src: config.yml - dest: "{{ cloudflare_data_directory }}/config.yml" + dest: "{{ cloudflare_ddns_data_directory }}/config.yml" register: template_files_result - name: Cloudflare Dynamic DNS Container community.docker.docker_container: - name: "{{ cloudflare_container_name }}" + name: "{{ cloudflare_ddns_container_name }}" image: joshava/cloudflare-ddns:latest pull: true volumes: - - "{{ cloudflare_data_directory }}/config.yml:/app/config.yaml" + - "{{ cloudflare_ddns_data_directory }}/config.yml:/app/config.yaml" restart_policy: unless-stopped - memory: "{{ cloudflare_memory }}" + memory: "{{ cloudflare_ddns_memory }}" recreate: "{{ template_files_result is changed }}" when: cloudflare_ddns_enabled is true @@ -33,6 +33,6 @@ block: - name: Stop Cloudflare DDNS community.docker.docker_container: - name: "{{ cloudflare_container_name }}" + name: "{{ cloudflare_ddns_container_name }}" state: absent when: cloudflare_ddns_enabled is false diff --git a/roles/code-server/requirements.yml b/roles/code-server/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/code-server/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/commafeed/requirements.yml b/roles/commafeed/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/commafeed/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/couchpotato/requirements.yml b/roles/couchpotato/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/couchpotato/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/dashy/molecule/default/molecule.yml b/roles/dashy/molecule/default/molecule.yml index e9b374274a..0540931935 100644 --- a/roles/dashy/molecule/default/molecule.yml +++ b/roles/dashy/molecule/default/molecule.yml @@ -1,6 +1,16 @@ --- +platforms: + - name: instance + image: geerlingguy/docker-ubuntu2204-ansible:latest + volumes: + - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /var/run/docker.sock:/var/run/docker.sock + - /tmp:/tmp + privileged: true + pre_build_image: true provisioner: inventory: group_vars: all: dashy_enabled: true + dashy_data_directory: "/tmp/dashy" diff --git a/roles/dashy/requirements.yml b/roles/dashy/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/dashy/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/deluge/requirements.yml b/roles/deluge/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/deluge/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/dockge/requirements.yml b/roles/dockge/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/dockge/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/dokuwiki/requirements.yml b/roles/dokuwiki/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/dokuwiki/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/drone-ci/requirements.yml b/roles/drone-ci/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/drone-ci/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/dufs/requirements.yml b/roles/dufs/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/dufs/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/duplicacy/requirements.yml b/roles/duplicacy/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/duplicacy/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/ebusd/defaults/main.yml b/roles/ebusd/defaults/main.yml index e5ee9185af..52b170e48d 100644 --- a/roles/ebusd/defaults/main.yml +++ b/roles/ebusd/defaults/main.yml @@ -25,7 +25,7 @@ ebusd_devices: ebusd_device: "/dev/ttyUSB0" # ebusd_nodevicecheck: "" # Only read from device, never write to it -ebusd_readonly: "" # "1" +# ebusd_readonly: "" # "1" # Send an initial escape symbol after connecting device # ebusd_initsend: "" # Extra transfer latency in ms diff --git a/roles/ebusd/requirements.yml b/roles/ebusd/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/ebusd/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/emby/requirements.yml b/roles/emby/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/emby/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/esphome/requirements.yml b/roles/esphome/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/esphome/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/excalidraw/requirements.yml b/roles/excalidraw/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/excalidraw/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/firefly/requirements.yml b/roles/firefly/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/firefly/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/flame/requirements.yml b/roles/flame/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/flame/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/flarum/requirements.yml b/roles/flarum/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/flarum/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/flatnotes/requirements.yml b/roles/flatnotes/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/flatnotes/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/freshrss/requirements.yml b/roles/freshrss/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/freshrss/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/frigate/defaults/main.yml b/roles/frigate/defaults/main.yml index 6a355d52e6..6068e23cd1 100644 --- a/roles/frigate/defaults/main.yml +++ b/roles/frigate/defaults/main.yml @@ -33,6 +33,6 @@ frigate_mqtt_client_id: "frigate" frigate_mqtt_user: "user" frigate_mqtt_password: "password" frigate_devices: # add device mapping as needed - - /dev/bus/usb:/dev/bus/usb +# - /dev/bus/usb:/dev/bus/usb # - /dev/apex_0:/dev/apex_0 # - /dev/dri/renderD128 diff --git a/roles/frigate/requirements.yml b/roles/frigate/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/frigate/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/gaps/requirements.yml b/roles/gaps/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/gaps/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/get_iplayer/requirements.yml b/roles/get_iplayer/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/get_iplayer/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/ghost/requirements.yml b/roles/ghost/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/ghost/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/gitea/requirements.yml b/roles/gitea/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/gitea/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/gitlab/requirements.yml b/roles/gitlab/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/gitlab/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/glances/requirements.yml b/roles/glances/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/glances/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/gotify/requirements.yml b/roles/gotify/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/gotify/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/graylog/requirements.yml b/roles/graylog/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/graylog/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/grocy/requirements.yml b/roles/grocy/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/grocy/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/guacamole/requirements.yml b/roles/guacamole/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/guacamole/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/hafusion/requirements.yml b/roles/hafusion/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/hafusion/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/healthchecks.io/requirements.yml b/roles/healthchecks.io/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/healthchecks.io/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/heimdall/requirements.yml b/roles/heimdall/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/heimdall/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/hello_world/requirements.yml b/roles/hello_world/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/hello_world/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/homeassistant/requirements.yml b/roles/homeassistant/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/homeassistant/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/homebridge/requirements.yml b/roles/homebridge/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/homebridge/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/homepage/requirements.yml b/roles/homepage/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/homepage/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/huginn/requirements.yml b/roles/huginn/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/huginn/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/huntly/requirements.yml b/roles/huntly/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/huntly/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/icbinv/requirements.yml b/roles/icbinv/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/icbinv/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/immich/defaults/main.yml b/roles/immich/defaults/main.yml index 4e67816247..e80195b04a 100644 --- a/roles/immich/defaults/main.yml +++ b/roles/immich/defaults/main.yml @@ -18,27 +18,26 @@ immich_typesense_memory: 1g immich_server_memory: 1g immich_microservices_memory: 1g immich_machinelearning_memory: 1g +immich_web_memory: 1g +immich_proxy_memory: 1g # docker immich_postgres_container_name: "immich_postgres" immich_redis_container_name: "immich_redis" -immich_typesense_container_name: "typesense" immich_server_container_name: "immich_server" immich_microservices_container_name: "immich_microservices" immich_machinelearning_container_name: "immich_machine_learning" -immich_postgres_image: "postgres" -immich_postgres_tag: "14-alpine" +immich_postgres_image: "tensorchord/pgvecto-rs" +immich_postgres_tag: "pg14-v0.2.0" immich_redis_image: "redis" immich_redis_tag: "6.2-alpine" -immich_typesense_image: "typesense/typesense" -immich_typesense_tag: "0.24.1@sha256:9bcff2b829f12074426ca044b56160ca9d777a0c488303469143dd9f8259d4dd" immich_server_image: "ghcr.io/immich-app/immich-server" -immich_server_tag: "release" +immich_server_tag: "{{ immich_version }}" immich_microservices_image: "ghcr.io/immich-app/immich-server" -immich_microservices_tag: "release" +immich_microservices_tag: "{{ immich_version }}" immich_machinelearning_image: "ghcr.io/immich-app/immich-machine-learning" -immich_machinelearning_tag: "release" +immich_machinelearning_tag: "{{ immich_version }}" immich_user_id: "1000" immich_group_id: "1000" @@ -49,9 +48,9 @@ immich_db_name: "immich" immich_db_port: "5432" # immich +immich_version: "release" immich_jwt_secret: "verylongandsecrettext" immich_enable_mapbox: "false" immich_mapbox_key: "" +immich_upload_location: "./library" immich_public_login_page_message: "Welcome to Immich!" - -immich_typesense_api_key: "1234567890" diff --git a/roles/immich/docs/immich.md b/roles/immich/docs/immich.md index 617312a3b6..d1088001ce 100644 --- a/roles/immich/docs/immich.md +++ b/roles/immich/docs/immich.md @@ -6,14 +6,10 @@ Self-hosted photo and video backup solution directly from your mobile phone. ## Usage -Set `immich_enabled: true` in your `inventories//group_vars/nas.yml` file. +Set `immich_enabled: true` in your `inventories//nas.yml` file. Set all `immich_*` variables in `inventories//group_vars/all.yml`. The immich web interface can be found at [http://ansible_nas_host_or_ip:2283](http://ansible_nas_host_or_ip:2283). Refer to [https://immich.app/docs/install/post-install](https://immich.app/docs/install/post-install) for post-install steps (Registering Admin User, adding users, etc.). - -## Specific Configuration - -Please note the need for a CPU with AVX and AVX2 instruction set to run the Machine Learning container. Check [here](https://github.com/immich-app/immich/tree/c436c57cc9a2a23ae1fbd3ea52eeb947f32261cd#tensorflow-build-issue) for details. diff --git a/roles/immich/molecule/default/verify.yml b/roles/immich/molecule/default/verify.yml index 196a6e5ecc..7472bb59fe 100644 --- a/roles/immich/molecule/default/verify.yml +++ b/roles/immich/molecule/default/verify.yml @@ -17,11 +17,6 @@ name: "{{ immich_redis_container_name }}" register: result_redis - - name: Get Immich Typesense container state - community.docker.docker_container_info: - name: "{{ immich_typesense_container_name }}" - register: result_typsense - - name: Get Immich Server container state community.docker.docker_container_info: name: "{{ immich_server_container_name }}" @@ -44,8 +39,6 @@ - result_postgres.container['State']['Restarting'] == false - result_redis.container['State']['Status'] == "running" - result_redis.container['State']['Restarting'] == false - - result_typsense.container['State']['Status'] == "running" - - result_typsense.container['State']['Restarting'] == false - result_server.container['State']['Status'] == "running" - result_server.container['State']['Restarting'] == false - result_microservices.container['State']['Status'] == "running" diff --git a/roles/immich/molecule/default/verify_stopped.yml b/roles/immich/molecule/default/verify_stopped.yml index ee6b22f7df..4314ef9c81 100644 --- a/roles/immich/molecule/default/verify_stopped.yml +++ b/roles/immich/molecule/default/verify_stopped.yml @@ -19,12 +19,6 @@ state: absent register: result_redis - - name: Try and stop and remove Immich Typesense - community.docker.docker_container: - name: "{{ immich_typesense_container_name }}" - state: absent - register: result_typsense - - name: Try and stop and remove Immich Server community.docker.docker_container: name: "{{ immich_server_container_name }}" @@ -48,7 +42,6 @@ that: - not result_postgres.changed - not result_redis.changed - - not result_typsense.changed - not result_server.changed - not result_microservices.changed - not result_machinelearning.changed diff --git a/roles/immich/requirements.yml b/roles/immich/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/immich/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/immich/tasks/main.yml b/roles/immich/tasks/main.yml index 34917746db..71d8bf86bc 100644 --- a/roles/immich/tasks/main.yml +++ b/roles/immich/tasks/main.yml @@ -45,6 +45,7 @@ name: "{{ immich_redis_container_name }}" image: "{{ immich_redis_image }}:{{ immich_redis_tag }}" pull: true + command: --save 60 1 --loglevel warning volumes: - "{{ immich_data_directory }}/redis:/data:rw" networks: @@ -60,44 +61,26 @@ retries: 5 timeout: 3s - - name: Immich Typesense Docker Container - community.docker.docker_container: - name: "{{ immich_typesense_container_name }}" - image: "{{ immich_typesense_image }}:{{ immich_typesense_tag }}" - pull: true - volumes: - - "{{ immich_data_directory }}/tsdata:/data:rw" - networks: - - name: "{{ immich_network_name }}" - env: - TYPESENSE_API_KEY: "{{ immich_typesense_api_key }}" - TYPESENSE_DATA_DIR: "/data" - # remove this to get debug messages - GLOG_minloglevel: "1" - labels: - traefik.enable: "false" - restart_policy: always - memory: "{{ immich_typesense_memory }}" - - name: Immich Server Docker Container community.docker.docker_container: name: "{{ immich_server_container_name }}" image: "{{ immich_server_image }}:{{ immich_server_tag }}" pull: true - entrypoint: ["/bin/sh", "./start-server.sh"] + command: ["start.sh", "immich"] volumes: - "{{ immich_data_directory }}/data:/data:rw" - "{{ immich_upload_directory }}:/usr/src/app/upload:rw" - /etc/localtime:/etc/localtime:ro networks: - name: "{{ immich_network_name }}" - exposed: + ports: - "{{ immich_port }}:3001" env: TZ: "{{ ansible_nas_timezone }}" PUID: "{{ immich_user_id | quote }}" PGID: "{{ immich_group_id | quote }}" NODE_ENV: "production" + IMMICH_VERSION: "{{ immich_version }}" REDIS_HOSTNAME: "{{ immich_redis_container_name }}" DB_HOSTNAME: "{{ immich_postgres_container_name }}" DB_USERNAME: "{{ immich_db_username }}" @@ -107,9 +90,8 @@ JWT_SECRET: "{{ immich_jwt_secret }}" ENABLE_MAPBOX: "{{ immich_enable_mapbox }}" MAPBOX_KEY: "{{ immich_mapbox_key }}" - UPLOAD_LOCATION: "./upload" + UPLOAD_LOCATION: "{{ immich_upload_location }}" PUBLIC_LOGIN_PAGE_MESSAGE: "{{ immich_public_login_page_message }}" - TYPESENSE_API_KEY: "{{ immich_typesense_api_key }}" labels: traefik.enable: "{{ immich_available_externally | string }}" traefik.http.routers.immich.rule: "Host(`{{ immich_hostname }}.{{ ansible_nas_domain }}`)" @@ -117,7 +99,6 @@ traefik.http.routers.immich.tls.domains[0].main: "{{ ansible_nas_domain }}" traefik.http.routers.immich.tls.domains[0].sans: "*.{{ ansible_nas_domain }}" traefik.http.services.immich.loadbalancer.server.port: "3001" - command: ["start.sh", "immich"] restart_policy: unless-stopped memory: "{{ immich_server_memory }}" @@ -138,6 +119,7 @@ PUID: "{{ immich_user_id | quote }}" PGID: "{{ immich_group_id | quote }}" NODE_ENV: "production" + IMMICH_VERSION: "{{ immich_version }}" REDIS_HOSTNAME: "{{ immich_redis_container_name }}" DB_HOSTNAME: "{{ immich_postgres_container_name }}" DB_USERNAME: "{{ immich_db_username }}" @@ -147,9 +129,8 @@ JWT_SECRET: "{{ immich_jwt_secret }}" ENABLE_MAPBOX: "{{ immich_enable_mapbox }}" MAPBOX_KEY: "{{ immich_mapbox_key }}" - UPLOAD_LOCATION: "./upload" + UPLOAD_LOCATION: "{{ immich_upload_location }}" PUBLIC_LOGIN_PAGE_MESSAGE: "{{ immich_public_login_page_message }}" - TYPESENSE_API_KEY: "{{ immich_typesense_api_key }}" labels: traefik.enable: "false" restart_policy: unless-stopped @@ -171,6 +152,7 @@ PUID: "{{ immich_user_id | quote }}" PGID: "{{ immich_group_id | quote }}" NODE_ENV: "production" + IMMICH_VERSION: "{{ immich_version }}" REDIS_HOSTNAME: "{{ immich_redis_container_name }}" DB_HOSTNAME: "{{ immich_postgres_container_name }}" DB_USERNAME: "{{ immich_db_username }}" @@ -180,9 +162,8 @@ JWT_SECRET: "{{ immich_jwt_secret }}" ENABLE_MAPBOX: "{{ immich_enable_mapbox }}" MAPBOX_KEY: "{{ immich_mapbox_key }}" - UPLOAD_LOCATION: "./upload" + UPLOAD_LOCATION: "{{ immich_upload_location }}" PUBLIC_LOGIN_PAGE_MESSAGE: "{{ immich_public_login_page_message }}" - TYPESENSE_API_KEY: "{{ immich_typesense_api_key }}" labels: traefik.enable: "false" restart_policy: unless-stopped @@ -201,11 +182,6 @@ name: "{{ immich_redis_container_name }}" state: absent - - name: Stop Immich Typesense - community.docker.docker_container: - name: "{{ immich_typesense_container_name }}" - state: absent - - name: Stop Immich Server community.docker.docker_container: name: "{{ immich_server_container_name }}" diff --git a/roles/invidious/requirements.yml b/roles/invidious/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/invidious/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/jackett/requirements.yml b/roles/jackett/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/jackett/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/jellyfin/requirements.yml b/roles/jellyfin/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/jellyfin/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/joomla/requirements.yml b/roles/joomla/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/joomla/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/kavita/requirements.yml b/roles/kavita/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/kavita/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/keycloak/requirements.yml b/roles/keycloak/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/keycloak/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/komga/requirements.yml b/roles/komga/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/komga/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/krusader/requirements.yml b/roles/krusader/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/krusader/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/lazylibrarian/requirements.yml b/roles/lazylibrarian/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/lazylibrarian/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/leantime/requirements.yml b/roles/leantime/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/leantime/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/libreddit/requirements.yml b/roles/libreddit/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/libreddit/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/librephotos/requirements.yml b/roles/librephotos/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/librephotos/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/librespeed/requirements.yml b/roles/librespeed/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/librespeed/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/libretranslate/requirements.yml b/roles/libretranslate/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/libretranslate/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/lidarr/requirements.yml b/roles/lidarr/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/lidarr/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/linkding/requirements.yml b/roles/linkding/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/linkding/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/linkwarden/requirements.yml b/roles/linkwarden/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/linkwarden/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/listmonk/requirements.yml b/roles/listmonk/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/listmonk/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/littlelink/defaults/main.yml b/roles/littlelink/defaults/main.yml index 52d86583b6..4721efac6e 100644 --- a/roles/littlelink/defaults/main.yml +++ b/roles/littlelink/defaults/main.yml @@ -20,89 +20,89 @@ littlelink_user_id: "1000" littlelink_group_id: "1000" # littlelink -linktree_meta_title: "Techno Tim" -linktree_meta_description: "Software Engineer | Gamer | Twitch Streamer | Content Creator on YouTube | Homelab | πŸ‡ΊπŸ‡Έ πŸ‡―πŸ‡΅ | Full Nerd" -linktree_meta_author: "Techno Tim" -linktree_meta_keywords: "HomeLab, HTML, CSS, Engineering" -linktree_lang: "en" -linktree_meta_index_status: "all" -linktree_og_site_name: "Techno Tim" -linktree_og_title: "Techno Tim" -linktree_og_description: "The home of Techno Tim" -linktree_og_url: "https://technotim.live" -linktree_og_image: "https://pbs.twimg.com/profile_images/1286144221217316864/qIAsKOpB_400x400.jpg" -linktree_og_image_width: "400" -linktree_og_image_height: "400" -linktree_ga_tracking_id: "G-XXXXXXXXXX" -linktree_theme: "Dark" -linktree_favicon_url: "https://pbs.twimg.com/profile_images/1286144221217316864/qIAsKOpB_200x200.jpg" -linktree_avatar_url: "https://pbs.twimg.com/profile_images/1286144221217316864/qIAsKOpB_200x200.jpg" -linktree_avatar_2x_url: "https://pbs.twimg.com/profile_images/1286144221217316864/qIAsKOpB_400x400.jpg" -linktree_avatar_alt: "Techno Tim Profile Pic" -linktree_name: "TechnoTim" -linktree_bio: "Software Engineer | Gamer | Twitch Streamer | Content Creator on YouTube | Homelab | πŸ‡ΊπŸ‡Έ πŸ‡―πŸ‡΅ | Full Nerd" +littlelink_meta_title: "Techno Tim" +littlelink_meta_description: "Software Engineer | Gamer | Twitch Streamer | Content Creator on YouTube | Homelab | πŸ‡ΊπŸ‡Έ πŸ‡―πŸ‡΅ | Full Nerd" +littlelink_meta_author: "Techno Tim" +littlelink_meta_keywords: "HomeLab, HTML, CSS, Engineering" +littlelink_lang: "en" +littlelink_meta_index_status: "all" +littlelink_og_site_name: "Techno Tim" +littlelink_og_title: "Techno Tim" +littlelink_og_description: "The home of Techno Tim" +littlelink_og_url: "https://technotim.live" +littlelink_og_image: "https://pbs.twimg.com/profile_images/1286144221217316864/qIAsKOpB_400x400.jpg" +littlelink_og_image_width: "400" +littlelink_og_image_height: "400" +littlelink_ga_tracking_id: "G-XXXXXXXXXX" +littlelink_theme: "Dark" +littlelink_favicon_url: "https://pbs.twimg.com/profile_images/1286144221217316864/qIAsKOpB_200x200.jpg" +littlelink_avatar_url: "https://pbs.twimg.com/profile_images/1286144221217316864/qIAsKOpB_200x200.jpg" +littlelink_avatar_2x_url: "https://pbs.twimg.com/profile_images/1286144221217316864/qIAsKOpB_400x400.jpg" +littlelink_avatar_alt: "Techno Tim Profile Pic" +littlelink_name: "TechnoTim" +littlelink_bio: "Software Engineer | Gamer | Twitch Streamer | Content Creator on YouTube | Homelab | πŸ‡ΊπŸ‡Έ πŸ‡―πŸ‡΅ | Full Nerd" # use ENV variable names for order, listed buttons will be boosted to the top -linktree_button_order: "YOUTUBE,TWITCH,TWITTER,GITHUB,INSTAGRAM,LINKED_IN,DISCORD,FACEBOOK,TIKTOK,PATREON,GEAR,DOCUMENTATION" -linktree_custom_button_text: "Documentation,Recommended Gear" -linktree_custom_button_url: "https://l.technotim.live/docs,https://l.technotim.live/gear" -linktree_custom_button_color: "#000000,#000000" -linktree_custom_button_text_color: "#ffffff,#ffffff" -linktree_custom_button_alt_text: "Tech documentation site for my videos and more,Recommended Gear" -linktree_custom_button_name: "DOCUMENTATION,GEAR" -linktree_custom_button_icon: "fas file-alt,fas fa-cog" -linktree_github: "https://l.technotim.live/github" -linktree_twitter: "https://l.technotim.live/twitter" -linktree_instagram: "https://l.technotim.live/instagram" -linktree_linked_in: "https://l.technotim.live/linkedin" -linktree_youtube: "https://l.technotim.live/subscribe" -linktree_twitch: "https://l.technotim.live/twitch" -linktree_discord: "https://l.technotim.live/discord" -linktree_tiktok: "https://l.technotim.live/tiktok" -linktree_facebook: "https://l.technotim.live/facebook" -linktree_patreon: "https://l.technotim.live/patreon" -linktree_footer: "Techno Tim Β© 2023" +littlelink_button_order: "YOUTUBE,TWITCH,TWITTER,GITHUB,INSTAGRAM,LINKED_IN,DISCORD,FACEBOOK,TIKTOK,PATREON,GEAR,DOCUMENTATION" +littlelink_custom_button_text: "Documentation,Recommended Gear" +littlelink_custom_button_url: "https://l.technotim.live/docs,https://l.technotim.live/gear" +littlelink_custom_button_color: "#000000,#000000" +littlelink_custom_button_text_color: "#ffffff,#ffffff" +littlelink_custom_button_alt_text: "Tech documentation site for my videos and more,Recommended Gear" +littlelink_custom_button_name: "DOCUMENTATION,GEAR" +littlelink_custom_button_icon: "fas file-alt,fas fa-cog" +littlelink_github: "https://l.technotim.live/github" +littlelink_twitter: "https://l.technotim.live/twitter" +littlelink_instagram: "https://l.technotim.live/instagram" +littlelink_linked_in: "https://l.technotim.live/linkedin" +littlelink_youtube: "https://l.technotim.live/subscribe" +littlelink_twitch: "https://l.technotim.live/twitch" +littlelink_discord: "https://l.technotim.live/discord" +littlelink_tiktok: "https://l.technotim.live/tiktok" +littlelink_facebook: "https://l.technotim.live/facebook" +littlelink_patreon: "https://l.technotim.live/patreon" +littlelink_footer: "Techno Tim Β© 2023" littlelink_env: TZ: "{{ ansible_nas_timezone }}" - META_TITLE: "{{ linktree_meta_title }}" - META_DESCRIPTION: "{{ linktree_meta_description }}" - META_AUTHOR: "{{ linktree_meta_author }}" - META_KEYWORDS: "{{ linktree_meta_keywords }}" - LANG: "{{ linktree_lang }}" - META_INDEX_STATUS: "{{ linktree_meta_index_status }}" - OG_SITE_NAME: "{{ linktree_og_site_name }}" - OG_TITLE: "{{ linktree_og_title }}" - OG_DESCRIPTION: "{{ linktree_og_description }}" - OG_URL: "{{ linktree_og_url }}" - OG_IMAGE: "{{ linktree_og_image }}" - OG_IMAGE_WIDTH: "{{ linktree_og_image_width }}" - OG_IMAGE_HEIGHT: "{{ linktree_og_image_height }}" - GA_TRACKING_ID: "{{ linktree_ga_tracking_id }}" - THEME: "{{ linktree_theme }}" - FAVICON_URL: "{{ linktree_favicon_url }}" - AVATAR_URL: "{{ linktree_avatar_url }}" - AVATAR_2X_URL: "{{ linktree_avatar_2x_url }}" - AVATAR_ALT: "{{ linktree_avatar_alt }}" - NAME: "{{ linktree_name }}" - BIO: "{{ linktree_bio }}" - BUTTON_ORDER: "{{ linktree_button_order }}" + META_TITLE: "{{ littlelink_meta_title }}" + META_DESCRIPTION: "{{ littlelink_meta_description }}" + META_AUTHOR: "{{ littlelink_meta_author }}" + META_KEYWORDS: "{{ littlelink_meta_keywords }}" + LANG: "{{ littlelink_lang }}" + META_INDEX_STATUS: "{{ littlelink_meta_index_status }}" + OG_SITE_NAME: "{{ littlelink_og_site_name }}" + OG_TITLE: "{{ littlelink_og_title }}" + OG_DESCRIPTION: "{{ littlelink_og_description }}" + OG_URL: "{{ littlelink_og_url }}" + OG_IMAGE: "{{ littlelink_og_image }}" + OG_IMAGE_WIDTH: "{{ littlelink_og_image_width }}" + OG_IMAGE_HEIGHT: "{{ littlelink_og_image_height }}" + GA_TRACKING_ID: "{{ littlelink_ga_tracking_id }}" + THEME: "{{ littlelink_theme }}" + FAVICON_URL: "{{ littlelink_favicon_url }}" + AVATAR_URL: "{{ littlelink_avatar_url }}" + AVATAR_2X_URL: "{{ littlelink_avatar_2x_url }}" + AVATAR_ALT: "{{ littlelink_avatar_alt }}" + NAME: "{{ littlelink_name }}" + BIO: "{{ littlelink_bio }}" + BUTTON_ORDER: "{{ littlelink_button_order }}" # you can render an unlimited amount of custom buttons by adding # the CUSTOM_BUTTON_* variables and by using a comma as a separator. - CUSTOM_BUTTON_TEXT: "{{ linktree_custom_button_text }}" - CUSTOM_BUTTON_URL: "{{ linktree_custom_button_url }}" - CUSTOM_BUTTON_COLOR: "{{ linktree_custom_button_color }}" - CUSTOM_BUTTON_TEXT_COLOR: "{{ linktree_custom_button_text_color }}" - CUSTOM_BUTTON_ALT_TEXT: "{{ linktree_custom_button_alt_text }}" - CUSTOM_BUTTON_NAME: "{{ linktree_custom_button_name }}" - CUSTOM_BUTTON_ICON: "{{ linktree_custom_button_icon }}" - GITHUB: "{{ linktree_github }}" - TWITTER: "{{ linktree_twitter }}" - INSTAGRAM: "{{ linktree_instagram }}" - LINKED_IN: "{{ linktree_linked_in }}" - YOUTUBE: "{{ linktree_youtube }}" - TWITCH: "{{ linktree_twitch }}" - DISCORD: "{{ linktree_discord }}" - TIKTOK: "{{ linktree_tiktok }}" - FACEBOOK: "{{ linktree_facebook }}" - PATREON: "{{ linktree_patreon }}" - FOOTER: "{{ linktree_footer }}" + CUSTOM_BUTTON_TEXT: "{{ littlelink_custom_button_text }}" + CUSTOM_BUTTON_URL: "{{ littlelink_custom_button_url }}" + CUSTOM_BUTTON_COLOR: "{{ littlelink_custom_button_color }}" + CUSTOM_BUTTON_TEXT_COLOR: "{{ littlelink_custom_button_text_color }}" + CUSTOM_BUTTON_ALT_TEXT: "{{ littlelink_custom_button_alt_text }}" + CUSTOM_BUTTON_NAME: "{{ littlelink_custom_button_name }}" + CUSTOM_BUTTON_ICON: "{{ littlelink_custom_button_icon }}" + GITHUB: "{{ littlelink_github }}" + TWITTER: "{{ littlelink_twitter }}" + INSTAGRAM: "{{ littlelink_instagram }}" + LINKED_IN: "{{ littlelink_linked_in }}" + YOUTUBE: "{{ littlelink_youtube }}" + TWITCH: "{{ littlelink_twitch }}" + DISCORD: "{{ littlelink_discord }}" + TIKTOK: "{{ littlelink_tiktok }}" + FACEBOOK: "{{ littlelink_facebook }}" + PATREON: "{{ littlelink_patreon }}" + FOOTER: "{{ littlelink_footer }}" diff --git a/roles/littlelink/requirements.yml b/roles/littlelink/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/littlelink/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/lldap/defaults/main.yml b/roles/lldap/defaults/main.yml index c86b4672aa..1edaee225f 100644 --- a/roles/lldap/defaults/main.yml +++ b/roles/lldap/defaults/main.yml @@ -8,7 +8,7 @@ lldap_data_directory: "{{ docker_home }}/lldap" # network lldap_ui_port: "17170" lldap_port: "3890" -lldapsport: "6360" +lldap_ldaps_port: "6360" lldap_hostname: "lldap" # specs diff --git a/roles/lldap/requirements.yml b/roles/lldap/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/lldap/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/lldap/tasks/main.yml b/roles/lldap/tasks/main.yml index 1b67c9e683..42be7aa6aa 100644 --- a/roles/lldap/tasks/main.yml +++ b/roles/lldap/tasks/main.yml @@ -21,7 +21,7 @@ # For LDAP - "{{ lldap_port }}:3890" # For LDAPS (LDAP Over SSL), enable port if LLDAP_LDAPS_OPTIONS__ENABLED set true, look env below - # - "{{ lldaps_port }}:6360" + # - "{{ lldap_ldaps_port }}:6360" # For the web front-end - "{{ lldap_ui_port }}:17170" env: diff --git a/roles/mattermost/requirements.yml b/roles/mattermost/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/mattermost/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/mealie/requirements.yml b/roles/mealie/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/mealie/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/memos/requirements.yml b/roles/memos/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/memos/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/mergerfs/requirements.yml b/roles/mergerfs/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/mergerfs/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/minecraft-server/requirements.yml b/roles/minecraft-server/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/minecraft-server/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/minetest-server/requirements.yml b/roles/minetest-server/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/minetest-server/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/minidlna/requirements.yml b/roles/minidlna/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/minidlna/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/miniflux/requirements.yml b/roles/miniflux/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/miniflux/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/minio/requirements.yml b/roles/minio/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/minio/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/miniserve/requirements.yml b/roles/miniserve/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/miniserve/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/mosquitto/requirements.yml b/roles/mosquitto/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/mosquitto/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/moviematch/requirements.yml b/roles/moviematch/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/moviematch/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/mumble/requirements.yml b/roles/mumble/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/mumble/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/mylar/requirements.yml b/roles/mylar/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/mylar/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/mymediaforalexa/requirements.yml b/roles/mymediaforalexa/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/mymediaforalexa/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/mysql/requirements.yml b/roles/mysql/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/mysql/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/n8n/requirements.yml b/roles/n8n/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/n8n/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/navidrome/requirements.yml b/roles/navidrome/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/navidrome/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/netbootxyz/requirements.yml b/roles/netbootxyz/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/netbootxyz/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/netbox/requirements.yml b/roles/netbox/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/netbox/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/netdata/requirements.yml b/roles/netdata/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/netdata/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/nextcloud/requirements.yml b/roles/nextcloud/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/nextcloud/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/nodered/requirements.yml b/roles/nodered/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/nodered/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/nomad/requirements.yml b/roles/nomad/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/nomad/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/nzbget/requirements.yml b/roles/nzbget/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/nzbget/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/nzbhydra2/requirements.yml b/roles/nzbhydra2/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/nzbhydra2/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/octoprint/requirements.yml b/roles/octoprint/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/octoprint/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/olivetin/requirements.yml b/roles/olivetin/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/olivetin/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/ombi/requirements.yml b/roles/ombi/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/ombi/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/openbooks/requirements.yml b/roles/openbooks/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/openbooks/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/openhab/requirements.yml b/roles/openhab/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/openhab/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/openldap/requirements.yml b/roles/openldap/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/openldap/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/organizr/requirements.yml b/roles/organizr/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/organizr/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/overleaf/requirements.yml b/roles/overleaf/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/overleaf/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/overseerr/requirements.yml b/roles/overseerr/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/overseerr/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/paperless_ng/requirements.yml b/roles/paperless_ng/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/paperless_ng/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/photofield/requirements.yml b/roles/photofield/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/photofield/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/photoprism/requirements.yml b/roles/photoprism/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/photoprism/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/photostructure/requirements.yml b/roles/photostructure/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/photostructure/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/phpmyadmin/requirements.yml b/roles/phpmyadmin/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/phpmyadmin/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/piwigo/requirements.yml b/roles/piwigo/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/piwigo/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/plex/requirements.yml b/roles/plex/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/plex/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/portainer/requirements.yml b/roles/portainer/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/portainer/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/prowlarr/requirements.yml b/roles/prowlarr/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/prowlarr/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/pyload/requirements.yml b/roles/pyload/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/pyload/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/pytivo/requirements.yml b/roles/pytivo/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/pytivo/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/radarr/requirements.yml b/roles/radarr/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/radarr/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/rclone/requirements.yml b/roles/rclone/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/rclone/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/releasebell/requirements.yml b/roles/releasebell/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/releasebell/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/restic/defaults/main.yml b/roles/restic/defaults/main.yml index b1e702cb0d..212cb1d719 100644 --- a/roles/restic/defaults/main.yml +++ b/roles/restic/defaults/main.yml @@ -3,7 +3,7 @@ restic_enabled: false restic_service_user: root restic_service_group: root -restic_version_to_install: "0.15.1" # The version of Restic to install +restic_version_to_install: "0.15.2" # The version of Restic to install restic_download_location: "/opt/restic" # Download location for the restic binary restic_install_location: "/usr/local/bin" # Install location for the restic binary restic_config_folder: /root/restic # /home/{{ restic_service_user }}/restic @@ -92,10 +92,4 @@ restic_install_path: "/usr/local/bin" # Install location for the restic binary restic_script_dir: /root/restic # "/home/{{ restic_service_user }}/restic" # Location of the generated backup scripts restic_log_dir: "{{ restic_script_dir }}/log" # Location of the logs of the backup scripts restic_backup_script_template: restic_script_Linux.j2 -_platform_map: - i386: 386 - x86_64: amd64 - aarch64: arm64 - armv7l: arm - armv6l: arm restic_url_to_download_from: "https://github.com/restic/restic/releases/download/v{{ restic_version }}/restic_{{ restic_version }}_{{ ansible_system | lower }}_{{ _platform_map[arch] | default(arch) }}.bz2" # The URL to download restic from. Use this variable to overwrite the default diff --git a/roles/restic/main/requirements.yml b/roles/restic/main/requirements.yml index 2858161b8a..cb710c8134 100644 --- a/roles/restic/main/requirements.yml +++ b/roles/restic/main/requirements.yml @@ -1,2 +1,2 @@ --- -- name: arillso.restic +- name: andrewrothstein.restic diff --git a/roles/restic/molecule/default/molecule.yml b/roles/restic/molecule/default/molecule.yml index b3d7350831..91dc1781f6 100644 --- a/roles/restic/molecule/default/molecule.yml +++ b/roles/restic/molecule/default/molecule.yml @@ -9,6 +9,9 @@ provisioner: inventory: group_vars: all: + unarchive_deps_all_pkgs: + - gzip + - bzip2 restic_enabled: true restic_install_location: "/usr/local/bin" restic_create_cron_jobs: true diff --git a/roles/restic/requirements.yml b/roles/restic/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/restic/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/restic/tasks/main.yml b/roles/restic/tasks/main.yml index e64096ecc0..22d30833b2 100644 --- a/roles/restic/tasks/main.yml +++ b/roles/restic/tasks/main.yml @@ -28,12 +28,10 @@ - name: Include Restic role ansible.builtin.include_role: - name: arillso.restic + name: andrewrothstein.restic vars: - restic_url: "{{ restic_url_to_download_from }}" - restic_version: "{{ restic_version_to_install }}" # The version of Restic to install - restic_download_path: "{{ restic_download_location }}" # Download location for the restic binary - restic_install_path: "{{ restic_install_location }}" # Install location for the restic binary + restic_ver: "{{ restic_version_to_install }}" # The version of Restic to install + restic_install_dir: "{{ restic_install_location }}" # Install location for the restic binary restic_script_dir: "{{ restic_config_folder }}" # "/home/{{ restic_service_user }}/restic" # Location of the generated backup scripts restic_log_dir: "{{ restic_script_dir }}/log" # Location of the logs of the backup scripts restic_dir_owner: "{{ restic_service_user }}" # The owner of all created dirs diff --git a/roles/route53_ddns/defaults/main.yml b/roles/route53_ddns/defaults/main.yml index ea3638ce54..a570bd4e5f 100644 --- a/roles/route53_ddns/defaults/main.yml +++ b/roles/route53_ddns/defaults/main.yml @@ -3,26 +3,26 @@ route53_ddns_enabled: false # Data directory for config file -route53_data_directory: "{{ docker_home }}/route53_ddns" +route53_ddns_data_directory: "{{ docker_home }}/route53_ddns" # AWS access credentials -route53_key_id: "{{ mandatory }}" -route53_secret_key: "{{ mandatory }}" +route53_ddns_key_id: "{{ mandatory }}" +route53_ddns_secret_key: "{{ mandatory }}" # Managed DNS zone ID -route53_hosted_zone_id: "{{ mandatory }}" +route53_ddns_hosted_zone_id: "{{ mandatory }}" # The hostname to update -route53_host: "*.{{ ansible_nas_domain }}" +route53_ddns_host: "*.{{ ansible_nas_domain }}" # The Time-To-Live for the DNS entry -route53_ttl: 600 +route53_ddns_ttl: 600 # The CRON string schedule for checking and updating -route53_schedule: "*/30 * * * *" +route53_ddns_schedule: "*/30 * * * *" # Container -route53_memory: 512MB -route53_container_name: "route53-ddns" -route53_image_name: "crazymax/ddns-route53" -route53_image_version: "latest" +route53_ddns_memory: 512MB +route53_ddns_container_name: "route53-ddns" +route53_ddns_image_name: "crazymax/ddns-route53" +route53_ddns_image_version: "latest" diff --git a/roles/route53_ddns/molecule/default/molecule.yml b/roles/route53_ddns/molecule/default/molecule.yml index fee9222f94..9d0eb52613 100644 --- a/roles/route53_ddns/molecule/default/molecule.yml +++ b/roles/route53_ddns/molecule/default/molecule.yml @@ -3,11 +3,11 @@ provisioner: inventory: group_vars: all: - route53_enabled: true - route53_key_id: "abcdef" - route53_secret_key: "ghijkl" - route53_hosted_zone_id: "1000" - route53_data_directory: "/tmp/route53" + route53_ddns_enabled: true + route53_ddns_key_id: "abcdef" + route53_ddns_secret_key: "ghijkl" + route53_ddns_hosted_zone_id: "1000" + route53_ddns_data_directory: "/tmp/route53" platforms: - name: instance image: geerlingguy/docker-ubuntu2204-ansible:latest diff --git a/roles/route53_ddns/molecule/default/side_effect.yml b/roles/route53_ddns/molecule/default/side_effect.yml index 4ef789f91d..da19a6a15f 100644 --- a/roles/route53_ddns/molecule/default/side_effect.yml +++ b/roles/route53_ddns/molecule/default/side_effect.yml @@ -7,4 +7,4 @@ ansible.builtin.include_role: name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}" vars: - route53_enabled: false + route53_ddns_enabled: false diff --git a/roles/route53_ddns/molecule/default/verify.yml b/roles/route53_ddns/molecule/default/verify.yml index f64de7d790..c872946f95 100644 --- a/roles/route53_ddns/molecule/default/verify.yml +++ b/roles/route53_ddns/molecule/default/verify.yml @@ -9,7 +9,7 @@ - name: Get route53 container state community.docker.docker_container: - name: "{{ route53_container_name }}" + name: "{{ route53_ddns_container_name }}" register: result - name: Check if route53 containers are running diff --git a/roles/route53_ddns/molecule/default/verify_stopped.yml b/roles/route53_ddns/molecule/default/verify_stopped.yml index 114d565728..17c48d3c3b 100644 --- a/roles/route53_ddns/molecule/default/verify_stopped.yml +++ b/roles/route53_ddns/molecule/default/verify_stopped.yml @@ -9,7 +9,7 @@ - name: Try and stop and remove route53 community.docker.docker_container: - name: "{{ route53_container_name }}" + name: "{{ route53_ddns_container_name }}" state: absent register: result diff --git a/roles/route53_ddns/requirements.yml b/roles/route53_ddns/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/route53_ddns/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/route53_ddns/tasks/main.yml b/roles/route53_ddns/tasks/main.yml index 198420e8da..a80689ffd0 100644 --- a/roles/route53_ddns/tasks/main.yml +++ b/roles/route53_ddns/tasks/main.yml @@ -3,33 +3,33 @@ block: - name: Create AWS Route53 Dynamic DNS Directories ansible.builtin.file: - path: "{{ route53_data_directory }}" + path: "{{ route53_ddns_data_directory }}" state: directory - name: Generate AWS Route53 Dynamic DNS config file ansible.builtin.template: src: config.yml - dest: "{{ route53_data_directory }}/ddns-route53.yml" + dest: "{{ route53_ddns_data_directory }}/ddns-route53.yml" register: template_config - name: AWS Route53 Dynamic DNS Container community.docker.docker_container: - name: "{{ route53_container_name }}" - image: "{{ route53_image_name }}:{{ route53_image_version }}" + name: "{{ route53_ddns_container_name }}" + image: "{{ route53_ddns_image_name }}:{{ route53_ddns_image_version }}" pull: true env: - SCHEDULE: "{{ route53_schedule | string }}" + SCHEDULE: "{{ route53_ddns_schedule | string }}" volumes: - - "{{ route53_data_directory }}/ddns-route53.yml:/etc/ddns-route53/ddns-route53.yml" + - "{{ route53_ddns_data_directory }}/ddns-route53.yml:/etc/ddns-route53/ddns-route53.yml" restart_policy: unless-stopped - memory: "{{ route53_memory }}" + memory: "{{ route53_ddns_memory }}" recreate: "{{ template_config is changed }}" - when: route53_enabled is true + when: route53_ddns_enabled is true - name: Stop AWS Route53 Dynamic DNS block: - name: Stop AWS Route53 Dynamic DNS community.docker.docker_container: - name: "{{ route53_container_name }}" + name: "{{ route53_ddns_container_name }}" state: absent - when: route53_enabled is false + when: route53_ddns_enabled is false diff --git a/roles/route53_ddns/templates/config.yml b/roles/route53_ddns/templates/config.yml index 7f1c094176..bd9abba379 100644 --- a/roles/route53_ddns/templates/config.yml +++ b/roles/route53_ddns/templates/config.yml @@ -1,12 +1,12 @@ --- credentials: - accessKeyId: "{{ route53_key_id }}" - secretAccessKey: "{{ route53_secret_key }}" + accessKeyId: "{{ route53_ddns_key_id }}" + secretAccessKey: "{{ route53_ddns_secret_key }}" route53: - hostedZoneID: "{{ route53_hosted_zone_id }}" + hostedZoneID: "{{ route53_ddns_hosted_zone_id }}" recordsSet: - - name: "{{ route53_host }}." + - name: "{{ route53_ddns_host }}." type: "A" - ttl: "{{ route53_ttl }}" + ttl: "{{ route53_ddns_ttl }}" diff --git a/roles/rssbridge/requirements.yml b/roles/rssbridge/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/rssbridge/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/ryot/requirements.yml b/roles/ryot/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/ryot/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/sabnzbd/requirements.yml b/roles/sabnzbd/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/sabnzbd/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/seafile/requirements.yml b/roles/seafile/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/seafile/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/searxng/requirements.yml b/roles/searxng/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/searxng/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/servas/requirements.yml b/roles/servas/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/servas/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/shaarli/requirements.yml b/roles/shaarli/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/shaarli/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/sickchill/requirements.yml b/roles/sickchill/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/sickchill/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/snipeit/requirements.yml b/roles/snipeit/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/snipeit/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/sonarr/requirements.yml b/roles/sonarr/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/sonarr/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/speedtest-tracker/requirements.yml b/roles/speedtest-tracker/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/speedtest-tracker/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/standardnotes/requirements.yml b/roles/standardnotes/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/standardnotes/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/stats/requirements.yml b/roles/stats/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/stats/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/stirlingpdf/requirements.yml b/roles/stirlingpdf/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/stirlingpdf/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/syncthing/requirements.yml b/roles/syncthing/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/syncthing/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/tautulli/requirements.yml b/roles/tautulli/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/tautulli/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/thelounge/requirements.yml b/roles/thelounge/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/thelounge/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/threadfin/requirements.yml b/roles/threadfin/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/threadfin/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/tiddlywiki/requirements.yml b/roles/tiddlywiki/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/tiddlywiki/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/timemachine/requirements.yml b/roles/timemachine/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/timemachine/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/traefik/requirements.yml b/roles/traefik/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/traefik/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/transmission-with-openvpn/requirements.yml b/roles/transmission-with-openvpn/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/transmission-with-openvpn/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/transmission/requirements.yml b/roles/transmission/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/transmission/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/trilium/requirements.yml b/roles/trilium/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/trilium/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/ttrss/requirements.yml b/roles/ttrss/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/ttrss/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/ubooquity/requirements.yml b/roles/ubooquity/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/ubooquity/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/utorrent/requirements.yml b/roles/utorrent/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/utorrent/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/vaultwarden/requirements.yml b/roles/vaultwarden/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/vaultwarden/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/virtual_desktop/requirements.yml b/roles/virtual_desktop/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/virtual_desktop/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/wallabag/requirements.yml b/roles/wallabag/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/wallabag/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/watchtower/requirements.yml b/roles/watchtower/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/watchtower/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/webtrees/requirements.yml b/roles/webtrees/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/webtrees/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/wger/requirements.yml b/roles/wger/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/wger/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/whatsupdocker/requirements.yml b/roles/whatsupdocker/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/whatsupdocker/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/whoogle/requirements.yml b/roles/whoogle/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/whoogle/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/wireshark/requirements.yml b/roles/wireshark/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/wireshark/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/wishthis/requirements.yml b/roles/wishthis/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/wishthis/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/woodpecker-ci/requirements.yml b/roles/woodpecker-ci/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/woodpecker-ci/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/youtubedlmaterial/requirements.yml b/roles/youtubedlmaterial/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/youtubedlmaterial/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/roles/znc/requirements.yml b/roles/znc/requirements.yml new file mode 120000 index 0000000000..9a736435ab --- /dev/null +++ b/roles/znc/requirements.yml @@ -0,0 +1 @@ +../../requirements.yml \ No newline at end of file diff --git a/tests/molecule/base.yml b/tests/molecule/base.yml index 71064d1549..a22166fbe5 100644 --- a/tests/molecule/base.yml +++ b/tests/molecule/base.yml @@ -7,8 +7,9 @@ platforms: - name: instance image: geerlingguy/docker-ubuntu2204-ansible:latest volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:ro + - /sys/fs/cgroup:/sys/fs/cgroup:rw - /var/run/docker.sock:/var/run/docker.sock + cgroupns_mode: host privileged: true pre_build_image: true provisioner: diff --git a/tests/molecule/default/collections.yaml b/tests/molecule/default/collections.yaml new file mode 100644 index 0000000000..a9a984bec1 --- /dev/null +++ b/tests/molecule/default/collections.yaml @@ -0,0 +1,4 @@ +--- +collections: + - name: community.docker + version: ">=3.4.11" diff --git a/tests/molecule/resources/playbooks/prepare.yml b/tests/molecule/resources/playbooks/prepare.yml index 9f99eba4cc..8f17e535df 100644 --- a/tests/molecule/resources/playbooks/prepare.yml +++ b/tests/molecule/resources/playbooks/prepare.yml @@ -7,3 +7,4 @@ name: - docker - urllib3<2 + - molecule-plugins[docker]