From e68eefc42a9e1f595a434dd88c91012ca74d5f3c Mon Sep 17 00:00:00 2001 From: VC Date: Thu, 7 Nov 2024 09:59:39 +0100 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F:=20separate=20transmission/j?= =?UTF-8?q?ackett/sonarr?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- playbooks/bittorrent.yml | 4 ++- roles/bittorrent/handlers/main.yml | 23 ------------- roles/bittorrent/tasks/main.yml | 10 ------ roles/bittorrent/tasks/nfsclient.yml | 15 --------- roles/bittorrent/tasks/sonarr.yml | 32 ------------------- roles/bittorrent/templates/exports.j2 | 1 - roles/jackett/handlers/main.yml | 7 ++++ .../jackett.yml => jackett/tasks/main.yml} | 4 +-- roles/jackett/templates/jackett.service.j2 | 17 ++++++++++ roles/jackett/vars/main.yml | 5 +++ roles/transmission/handlers/main.yml | 6 ++++ .../tasks/main.yml} | 0 .../templates/jackett.service.j2 | 0 .../templates/settings.json.j2 | 0 .../vars/main.yml | 0 15 files changed, 40 insertions(+), 84 deletions(-) delete mode 100644 roles/bittorrent/handlers/main.yml delete mode 100644 roles/bittorrent/tasks/main.yml delete mode 100644 roles/bittorrent/tasks/nfsclient.yml delete mode 100644 roles/bittorrent/tasks/sonarr.yml delete mode 100644 roles/bittorrent/templates/exports.j2 create mode 100644 roles/jackett/handlers/main.yml rename roles/{bittorrent/tasks/jackett.yml => jackett/tasks/main.yml} (84%) create mode 100644 roles/jackett/templates/jackett.service.j2 create mode 100644 roles/jackett/vars/main.yml create mode 100644 roles/transmission/handlers/main.yml rename roles/{bittorrent/tasks/transmission.yml => transmission/tasks/main.yml} (100%) rename roles/{bittorrent => transmission}/templates/jackett.service.j2 (100%) rename roles/{bittorrent => transmission}/templates/settings.json.j2 (100%) rename roles/{bittorrent => transmission}/vars/main.yml (100%) diff --git a/playbooks/bittorrent.yml b/playbooks/bittorrent.yml index 0bd8841..f483c60 100644 --- a/playbooks/bittorrent.yml +++ b/playbooks/bittorrent.yml @@ -4,4 +4,6 @@ hosts: transmission diff: true roles: - - bittorrent + - transmission + - jackett + - sonarr diff --git a/roles/bittorrent/handlers/main.yml b/roles/bittorrent/handlers/main.yml deleted file mode 100644 index 94c9f40..0000000 --- a/roles/bittorrent/handlers/main.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - -- name: Reload transmission - ansible.builtin.service: - name: transmission-daemon - state: reloaded - -- name: Restart sonarr - ansible.builtin.service: - name: sonarr - state: restarted - -- name: Export nfs - ansible.builtin.command: - cmd: exportfs -a - changed_when: true - -- name: Restart jackett - ansible.builtin.systemd_service: - name: jackett - daemon_reload: true - enabled: true - state: restarted diff --git a/roles/bittorrent/tasks/main.yml b/roles/bittorrent/tasks/main.yml deleted file mode 100644 index ecf6fca..0000000 --- a/roles/bittorrent/tasks/main.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- - -- name: Include transmission - ansible.builtin.include_tasks: transmission.yml -- name: Include sonarr - ansible.builtin.include_tasks: sonarr.yml -- name: Include jackett - ansible.builtin.include_tasks: jackett.yml -- name: Include nfsclient - ansible.builtin.include_tasks: nfsclient.yml diff --git a/roles/bittorrent/tasks/nfsclient.yml b/roles/bittorrent/tasks/nfsclient.yml deleted file mode 100644 index 43bf669..0000000 --- a/roles/bittorrent/tasks/nfsclient.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- - -- name: Put NFS client on fstab - ansible.posix.mount: - path: /net - src: nfs.mateu.be:/mnt/tank/nfs - fstype: nfs - opts: auto,x-systemd.automount,_netdev,nofail,noatime,nolock,tcp,actimeo=1800,bg,retry=10 - state: present - -- name: Create cron for NFS client - ansible.builtin.cron: - name: "mount /net" - special_time: reboot - job: "mount -a" diff --git a/roles/bittorrent/tasks/sonarr.yml b/roles/bittorrent/tasks/sonarr.yml deleted file mode 100644 index 1ac0cc4..0000000 --- a/roles/bittorrent/tasks/sonarr.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- - -- name: Install sonarr repokey - ansible.builtin.get_url: - url: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xa236c58f409091a18aca53cbebff6b99d9b78493 - dest: /etc/apt/trusted.gpg.d/sonarr.asc - owner: root - group: root - mode: "0o750" - -- name: Install sonarr repo - ansible.builtin.apt_repository: - repo: deb http://apt.sonarr.tv/debian buster-develop main - state: present - -- name: Create sonarr conf dir - ansible.builtin.file: - path: /var/lib/transmission-daemon/.config/NzbDrone - recurse: true - owner: debian-transmission - group: debian-transmission - mode: "a-rwx,u+rwX,g+rX" - -- name: Install sonarr - ansible.builtin.package: - name: sonarr - state: present - -- name: Enable sonarr service - ansible.builtin.service: - name: sonarr - enabled: true diff --git a/roles/bittorrent/templates/exports.j2 b/roles/bittorrent/templates/exports.j2 deleted file mode 100644 index c834d53..0000000 --- a/roles/bittorrent/templates/exports.j2 +++ /dev/null @@ -1 +0,0 @@ -/var/lib/transmission-daemon/downloads 10.233.212.64/26(ro,async,no_subtree_check,all_squash,anonuid={{ getent_passwd['debian-transmission'][1] }},anongid={{ getent_passwd['debian-transmission'][2] }}) diff --git a/roles/jackett/handlers/main.yml b/roles/jackett/handlers/main.yml new file mode 100644 index 0000000..5d84579 --- /dev/null +++ b/roles/jackett/handlers/main.yml @@ -0,0 +1,7 @@ +--- +- name: Restart jackett + ansible.builtin.systemd_service: + name: jackett + daemon_reload: true + enabled: true + state: restarted diff --git a/roles/bittorrent/tasks/jackett.yml b/roles/jackett/tasks/main.yml similarity index 84% rename from roles/bittorrent/tasks/jackett.yml rename to roles/jackett/tasks/main.yml index 6a55988..528cf87 100644 --- a/roles/bittorrent/tasks/jackett.yml +++ b/roles/jackett/tasks/main.yml @@ -3,7 +3,7 @@ - name: Create jackett user ansible.builtin.user: comment: jackett - home: "{{ bittorrent_jackett_home }}" + home: "{{ jackett_home }}" name: jackett password: '!' shell: /bin/bash @@ -11,7 +11,7 @@ - name: Unzip jackett ansible.builtin.unarchive: - src: "{{ bittorrent_jackett_download_url }}" + src: "{{ jackett_download_url }}" remote_src: true dest: "/opt" owner: jackett diff --git a/roles/jackett/templates/jackett.service.j2 b/roles/jackett/templates/jackett.service.j2 new file mode 100644 index 0000000..8b3ff3b --- /dev/null +++ b/roles/jackett/templates/jackett.service.j2 @@ -0,0 +1,17 @@ +[Unit] +Description=Jackett Daemon +After=network.target + +[Service] +SyslogIdentifier=jackett +Restart=always +RestartSec=5 +Type=simple +User=jackett +Group=jackett +WorkingDirectory={{ jackett_home }} +ExecStart=/bin/sh "{{ jackett_home }}/jackett_launcher.sh" +TimeoutStopSec=30 + +[Install] +WantedBy=multi-user.target diff --git a/roles/jackett/vars/main.yml b/roles/jackett/vars/main.yml new file mode 100644 index 0000000..8729974 --- /dev/null +++ b/roles/jackett/vars/main.yml @@ -0,0 +1,5 @@ +--- + +jackett_version: "v0.22.860" +jackett_download_url: "https://github.com/Jackett/Jackett/releases/download/{{ bittorrent_jackett_version }}/Jackett.Binaries.LinuxAMDx64.tar.gz" +jackett_home: "/opt/Jackett" diff --git a/roles/transmission/handlers/main.yml b/roles/transmission/handlers/main.yml new file mode 100644 index 0000000..5389941 --- /dev/null +++ b/roles/transmission/handlers/main.yml @@ -0,0 +1,6 @@ +--- + +- name: Reload transmission + ansible.builtin.service: + name: transmission-daemon + state: reloaded diff --git a/roles/bittorrent/tasks/transmission.yml b/roles/transmission/tasks/main.yml similarity index 100% rename from roles/bittorrent/tasks/transmission.yml rename to roles/transmission/tasks/main.yml diff --git a/roles/bittorrent/templates/jackett.service.j2 b/roles/transmission/templates/jackett.service.j2 similarity index 100% rename from roles/bittorrent/templates/jackett.service.j2 rename to roles/transmission/templates/jackett.service.j2 diff --git a/roles/bittorrent/templates/settings.json.j2 b/roles/transmission/templates/settings.json.j2 similarity index 100% rename from roles/bittorrent/templates/settings.json.j2 rename to roles/transmission/templates/settings.json.j2 diff --git a/roles/bittorrent/vars/main.yml b/roles/transmission/vars/main.yml similarity index 100% rename from roles/bittorrent/vars/main.yml rename to roles/transmission/vars/main.yml