From e49c4f80f35090fe38d728d85bd93d4faaa33abd Mon Sep 17 00:00:00 2001 From: Laur Ivan Date: Sun, 11 Dec 2022 22:25:04 +0100 Subject: [PATCH] Linting. --- .ansible-lint | 13 +++++++++++++ README.md | 13 ++++++++++--- molecule/default/prepare.yml | 12 +++++++----- templates/env.deluge.conf.j2 | 2 +- templates/env.jackett.conf.j2 | 2 +- templates/env.lidarr.conf.j2 | 2 +- templates/env.radarr.conf.j2 | 2 +- 7 files changed, 34 insertions(+), 12 deletions(-) create mode 100644 .ansible-lint diff --git a/.ansible-lint b/.ansible-lint new file mode 100644 index 0000000..03c436e --- /dev/null +++ b/.ansible-lint @@ -0,0 +1,13 @@ +skip_list: + - 'yaml' + - 'risky-shell-pipe' + - 'role-name' + - 'no-handler' + +kinds: + - meta: "**/meta/main.yml" + - tasks: "**/tasks/*.yml" + - vars: "**/vars/*.yml" + +exclude_paths: + - "**/requirements.yml" \ No newline at end of file diff --git a/README.md b/README.md index ca6e724..c99f29f 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,7 @@ If you need to install the containers with a specific user/group ID, then define arrs_uid: arrs_gid: ``` + The role allows oyu to specify which components will be installed: ```yml @@ -71,6 +72,7 @@ You can specify the image version and the port exposed: radarr_image_version: 'latest' radarr_host_port: 7878 ``` + You can also overwrite the location where radarr's configuration is stored (e.g. if you already have it installed and you want to use the Ansible role): ```yml @@ -96,6 +98,7 @@ You can specify the image version and the port exposed: sonarr_image_version: 'latest' sonarr_host_port: 8989 ``` + You can also overwrite the location where sonarr's configuration is stored (e.g. if you already have it installed and you want to use the Ansible role): ```yml @@ -113,7 +116,7 @@ sonarr_series_volume: '/mnt/videos/Series' - Depending on your settings, it will also rename your current series - You need write access to that directory, so Sonarr can actually copy the files -# Lidarr +### Lidarr You can specify the image version and the port exposed: @@ -121,11 +124,13 @@ You can specify the image version and the port exposed: lidarr_image_version: 'latest' lidarr_host_port: 8686 ``` + You can also overwrite the location where lidarr's configuration is stored (e.g. if you already have it installed and you want to use the Ansible role): ```yml lidarr_config_volume: '{{ arrs_configuration_volume }}/lidarr' ``` + Lidarr needs a place to copy the downloaded music: ```yml @@ -143,7 +148,8 @@ lidarr_music_volumes: The `path` is the actual directory where the collection is located and the `alias` is the internal mapping name in Docker. -# Jakett +### Jakett + You can specify the image version, the port exposed and to autoupdate: ```yml @@ -151,6 +157,7 @@ jackett_image_version: 'latest' jackett_auto_update: true jackett_host_port: 9117 ``` + You can also overwrite the location where jackett's configuration is stored (e.g. if you already have it installed and you want to use the Ansible role): ```yml @@ -173,6 +180,6 @@ You need a machine with docker and docker-compose installed. MIT -## Author Information +## Author Information This role was created in 2022 by [Laur Ivan](https://www.laurivan.com). diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml index 10a8d9b..56150f8 100644 --- a/molecule/default/prepare.yml +++ b/molecule/default/prepare.yml @@ -8,28 +8,30 @@ register: docker_sock_stat - name: Create docker.sock - raw: touch /var/run/docker.sock + ansible.builtin.raw: touch /var/run/docker.sock become: true changed_when: false when: not docker_sock_stat.stat.exists - name: Move docker.sock from tmp - raw: mount --move /tmp/docker_mounted.sock /var/run/docker.sock + ansible.builtin.raw: mount --move /tmp/docker_mounted.sock /var/run/docker.sock become: true changed_when: false when: not docker_sock_stat.stat.exists - name: Update apt cache. - apt: update_cache=yes cache_valid_time=600 + ansible.builtin.apt: update_cache=yes cache_valid_time=600 when: ansible_os_family == 'Debian' + - name: Install python requests - pip: + ansible.builtin.pip: name: - requests - docker - docker-compose + - name: Install docker vars: docker_service_manage: false - include_role: + ansible.builtin.include_role: name: geerlingguy.docker diff --git a/templates/env.deluge.conf.j2 b/templates/env.deluge.conf.j2 index 042f1da..eb34c71 100644 --- a/templates/env.deluge.conf.j2 +++ b/templates/env.deluge.conf.j2 @@ -5,4 +5,4 @@ PUID={{ arrs_uid }} {% endif %} {% if arrs_gid %} PGID={{ arrs_gid }} -{% endif %} \ No newline at end of file +{% endif %} diff --git a/templates/env.jackett.conf.j2 b/templates/env.jackett.conf.j2 index 07c9f58..244b473 100644 --- a/templates/env.jackett.conf.j2 +++ b/templates/env.jackett.conf.j2 @@ -5,4 +5,4 @@ PUID={{ arrs_uid }} {% endif %} {% if arrs_gid %} PGID={{ arrs_gid }} -{% endif %} \ No newline at end of file +{% endif %} diff --git a/templates/env.lidarr.conf.j2 b/templates/env.lidarr.conf.j2 index 184371d..d124082 100644 --- a/templates/env.lidarr.conf.j2 +++ b/templates/env.lidarr.conf.j2 @@ -4,4 +4,4 @@ PUID={{ arrs_uid }} {% endif %} {% if arrs_gid %} PGID={{ arrs_gid }} -{% endif %} \ No newline at end of file +{% endif %} diff --git a/templates/env.radarr.conf.j2 b/templates/env.radarr.conf.j2 index 0f3b899..87352e9 100644 --- a/templates/env.radarr.conf.j2 +++ b/templates/env.radarr.conf.j2 @@ -5,4 +5,4 @@ PUID={{ arrs_uid }} {% endif %} {% if arrs_gid %} PGID={{ arrs_gid }} -{% endif %} \ No newline at end of file +{% endif %}