From a50df7c30f1e86826e4b64a6e3767232438eb070 Mon Sep 17 00:00:00 2001 From: Paul-Henri Froidmont Date: Thu, 1 Mar 2018 02:53:13 +0100 Subject: [PATCH] Added sonarr, radarr, headphones and jackett --- playbook.yml | 2 +- .../files/deluge/docker-compose.yml | 39 ------ roles/deluge-docker/tasks/main.yml | 13 -- .../files/searx/docker-compose.yml | 2 +- .../defaults/main.yml | 0 .../files/torrent/docker-compose.yml | 114 ++++++++++++++++++ .../meta/main.yml | 0 roles/torrent-docker/tasks/main.yml | 13 ++ .../templates/torrent}/.env | 2 +- 9 files changed, 130 insertions(+), 55 deletions(-) delete mode 100644 roles/deluge-docker/files/deluge/docker-compose.yml delete mode 100644 roles/deluge-docker/tasks/main.yml rename roles/{deluge-docker => torrent-docker}/defaults/main.yml (100%) create mode 100644 roles/torrent-docker/files/torrent/docker-compose.yml rename roles/{deluge-docker => torrent-docker}/meta/main.yml (100%) create mode 100644 roles/torrent-docker/tasks/main.yml rename roles/{deluge-docker/templates/deluge => torrent-docker/templates/torrent}/.env (88%) diff --git a/playbook.yml b/playbook.yml index 5aeb772..2f2eef0 100644 --- a/playbook.yml +++ b/playbook.yml @@ -19,7 +19,7 @@ - { role: nextcloud-docker, tags: [ 'nextcloud', 'docker' ] } - { role: matrix-docker, tags: [ 'matrix', 'docker' ] } - { role: plex-docker, tags: [ 'plex', 'docker' ] } - - { role: deluge-docker, tags: [ 'deluge', 'docker' ] } + - { role: torrent-docker, tags: [ 'torrent', 'docker' ] } - { role: monit, tags: [ 'monit' ] } - { role: arch-mirror-docker, tags: [ 'mirror', 'docker' ] } # vars_prompt: diff --git a/roles/deluge-docker/files/deluge/docker-compose.yml b/roles/deluge-docker/files/deluge/docker-compose.yml deleted file mode 100644 index aea95e1..0000000 --- a/roles/deluge-docker/files/deluge/docker-compose.yml +++ /dev/null @@ -1,39 +0,0 @@ -version: '2.2' - -networks: - proxy-tier: - external: - name: nginx-proxy - -services: - deluge: - image: binhex/arch-delugevpn - cap_add: - - NET_ADMIN - ports: - - 8118:8118 - - 58846:58846 - volumes: - - /var/lib/deluge:/data - - ./config:/config - - /media:/media - - /etc/localtime:/etc/localtime:ro - environment: - - VPN_ENABLED=yes - - VPN_USER=${VPN_USER} - - VPN_PASS=${VPN_PASS} - - VPN_REMOTE=${VPN_REMOTE} - - VPN_PORT=${VPN_PORT} - - VPN_PROTOCOL=${VPN_PROTOCOL} - - VPN_PROV=${VPN_PROV} - - ENABLE_PRIVOXY=yes - - LAN_NETWORK=10.90.86.0/26 - - DEBUG=true - - PUID=33 - - PGID=33 - - VIRTUAL_HOST=${DELUGE_DOMAIN} - - VIRTUAL_NETWORK=nginx-proxy - - VIRTUAL_PORT=8112 - restart: always - networks: - - proxy-tier diff --git a/roles/deluge-docker/tasks/main.yml b/roles/deluge-docker/tasks/main.yml deleted file mode 100644 index fadf636..0000000 --- a/roles/deluge-docker/tasks/main.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -- name: Copy deluge docker files - copy: - src: deluge - dest: "{{docker_compose_files_folder}}" -- name: Create deluge .env - template: - src: deluge/.env - dest: "{{docker_compose_files_folder}}/deluge/.env" -- name: Start deluge docker project - docker_service: - project_src: "{{docker_compose_files_folder}}/deluge" - state: present \ No newline at end of file diff --git a/roles/searx-docker/files/searx/docker-compose.yml b/roles/searx-docker/files/searx/docker-compose.yml index ea01d2f..048c6e9 100644 --- a/roles/searx-docker/files/searx/docker-compose.yml +++ b/roles/searx-docker/files/searx/docker-compose.yml @@ -14,7 +14,7 @@ services: - VIRTUAL_HOST=banditlair.com - VIRTUAL_NETWORK=nginx-proxy - VIRTUAL_PORT=8888 - - LETSENCRYPT_HOST=banditlair.com,mail.banditlair.com,mailu.banditlair.com,webmail.banditlair.com,gitlab.banditlair.com,cloud.banditlair.com,plex.banditlair.com,deluge.banditlair.com,rpg.banditlair.com,matrix.banditlair.com,emby.banditlair.com,arch.banditlair.com + - LETSENCRYPT_HOST=banditlair.com,mail.banditlair.com,mailu.banditlair.com,webmail.banditlair.com,gitlab.banditlair.com,cloud.banditlair.com,plex.banditlair.com,deluge.banditlair.com,rpg.banditlair.com,matrix.banditlair.com,emby.banditlair.com,arch.banditlair.com,sonarr.banditlair.com,radarr.banditlair.com,headphones.banditlair.com,jackett.banditlair.com - LETSENCRYPT_EMAIL=letsencrypt.account@banditlair.com networks: - proxy-tier diff --git a/roles/deluge-docker/defaults/main.yml b/roles/torrent-docker/defaults/main.yml similarity index 100% rename from roles/deluge-docker/defaults/main.yml rename to roles/torrent-docker/defaults/main.yml diff --git a/roles/torrent-docker/files/torrent/docker-compose.yml b/roles/torrent-docker/files/torrent/docker-compose.yml new file mode 100644 index 0000000..740a714 --- /dev/null +++ b/roles/torrent-docker/files/torrent/docker-compose.yml @@ -0,0 +1,114 @@ +version: '2.2' + +networks: + proxy-tier: + external: + name: nginx-proxy + +services: + deluge: + image: binhex/arch-delugevpn + cap_add: + - NET_ADMIN + ports: + - 8118:8118 + - 58846:58846 + volumes: + - /var/lib/deluge:/data + - ./config/deluge:/config + - /media:/media + - /etc/localtime:/etc/localtime:ro + environment: + - VPN_ENABLED=yes + - VPN_USER=${VPN_USER} + - VPN_PASS=${VPN_PASS} + - VPN_REMOTE=${VPN_REMOTE} + - VPN_PORT=${VPN_PORT} + - VPN_PROTOCOL=${VPN_PROTOCOL} + - VPN_PROV=${VPN_PROV} + - ENABLE_PRIVOXY=yes + - LAN_NETWORK=10.90.86.0/26 + - DEBUG=false + - PUID=33 + - PGID=33 + - VIRTUAL_HOST=${DELUGE_DOMAIN} + - VIRTUAL_NETWORK=nginx-proxy + - VIRTUAL_PORT=8112 + restart: always + networks: + - proxy-tier + + sonarr: + image: linuxserver/sonarr + expose: + - 8989 + environment: + - PUID=33 + - PGID=33 + - VIRTUAL_HOST=sonarr.banditlair.com + - VIRTUAL_NETWORK=nginx-proxy + - VIRTUAL_PORT=8989 + volumes: + - /var/lib/deluge/completed:/downloads + - ./config/sonarr:/config + - /media/TV:/tv + - /etc/localtime:/etc/localtime:ro + restart: always + networks: + - proxy-tier + + radarr: + image: linuxserver/radarr + expose: + - 7878 + environment: + - PUID=33 + - PGID=33 + - VIRTUAL_HOST=radarr.banditlair.com + - VIRTUAL_NETWORK=nginx-proxy + - VIRTUAL_PORT=7878 + volumes: + - /var/lib/deluge/completed:/downloads + - ./config/radarr:/config + - /media/Movies:/movies + - /etc/localtime:/etc/localtime:ro + restart: always + networks: + - proxy-tier + + headphones: + image: linuxserver/headphones + expose: + - 8181 + environment: + - PUID=33 + - PGID=33 + - VIRTUAL_HOST=headphones.banditlair.com + - VIRTUAL_NETWORK=nginx-proxy + - VIRTUAL_PORT=8181 + volumes: + - /var/lib/deluge/completed:/downloads + - ./config/headphones:/config + - /media/Music:/music + - /etc/localtime:/etc/localtime:ro + restart: always + networks: + - proxy-tier + + jackett: + image: linuxserver/jackett + expose: + - 9117 + environment: + - PUID=33 + - PGID=33 + - VIRTUAL_HOST=jackett.banditlair.com + - VIRTUAL_NETWORK=nginx-proxy + - VIRTUAL_PORT=9117 + volumes: +# - /var/lib/deluge/completed:/downloads + - ./config/jackett:/config + - /etc/localtime:/etc/localtime:ro + restart: always + networks: + - proxy-tier diff --git a/roles/deluge-docker/meta/main.yml b/roles/torrent-docker/meta/main.yml similarity index 100% rename from roles/deluge-docker/meta/main.yml rename to roles/torrent-docker/meta/main.yml diff --git a/roles/torrent-docker/tasks/main.yml b/roles/torrent-docker/tasks/main.yml new file mode 100644 index 0000000..90e635d --- /dev/null +++ b/roles/torrent-docker/tasks/main.yml @@ -0,0 +1,13 @@ +--- +- name: Copy torrent docker files + copy: + src: torrent + dest: "{{docker_compose_files_folder}}" +- name: Create torrent .env + template: + src: torrent/.env + dest: "{{docker_compose_files_folder}}/torrent/.env" +- name: Start torrent docker project + docker_service: + project_src: "{{docker_compose_files_folder}}/torrent" + state: present \ No newline at end of file diff --git a/roles/deluge-docker/templates/deluge/.env b/roles/torrent-docker/templates/torrent/.env similarity index 88% rename from roles/deluge-docker/templates/deluge/.env rename to roles/torrent-docker/templates/torrent/.env index 818beab..917b472 100644 --- a/roles/deluge-docker/templates/deluge/.env +++ b/roles/torrent-docker/templates/torrent/.env @@ -1,4 +1,4 @@ -COMPOSE_PROJECT_NAME=deluge +COMPOSE_PROJECT_NAME=torrent #Domains DELUGE_DOMAIN=deluge.banditlair.com