From 5f35bc6c67cc7dd35b19420bfc7b8dc8db893051 Mon Sep 17 00:00:00 2001 From: Administrator Date: Thu, 18 Dec 2025 11:48:19 +0500 Subject: [PATCH] Update 2 files - /group_vars/all.yml - /roles/qbittorrent/tasks/main.yml --- group_vars/all.yml | 153 ++++++++++++++++--------------- roles/qbittorrent/tasks/main.yml | 33 ++----- 2 files changed, 85 insertions(+), 101 deletions(-) diff --git a/group_vars/all.yml b/group_vars/all.yml index d04cb3e..51a3cc3 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -203,81 +203,6 @@ ampache_logs_dir: "{{ ampache_base_dir }}/logs" ampache_mysql_dir: "{{ ampache_base_dir }}/mysql" ampache_port: "45134" -qbittorrent_base_dir: "/mnt/service/qbittorrent" -qbittorrent_config_dir: "{{ qbittorrent_base_dir }}/appdata" -qbittorrent_downloads_dir: "{{ qbittorrent_base_dir }}/downloads" -qbittorrent_puid: 1000 -qbittorrent_pgid: 1000 -qbittorrent_port_webui: 45135 -qbittorrent_port_torrent: 6881 -qbittorrent_user: "qbittorrent" -qbittorrent_password: "13qeadZC" -qbittorrent_smb_credentials_dir: "/etc/smb-creds" -qbittorrent_smb_creds: - olimp: - username: "Olimp" - password: "13qeadZC" - file: "olimp" -qbittorrent_shares: - - name: downloads - src: "//192.168.1.101/Downloads" - dest: "/mnt/downloads" - credential: "olimp" - opts: "rw,uid={{ qbittorrent_puid }},gid={{ qbittorrent_pgid }},file_mode=0777,dir_mode=0777,iocharset=utf8,vers=3.0" - - name: abook - src: "//192.168.1.203/Abook" - dest: "/mnt/video/abook" - opts: "rw,uid={{ qbittorrent_puid }},gid={{ qbittorrent_pgid }},file_mode=0777,dir_mode=0777,iocharset=utf8,vers=3.0,guest" - - name: music - src: "//192.168.1.203/Music" - dest: "/mnt/audio" - opts: "rw,uid={{ qbittorrent_puid }},gid={{ qbittorrent_pgid }},file_mode=0777,dir_mode=0777,iocharset=utf8,vers=3.0,guest" - - name: books - src: "//192.168.1.203/Books" - dest: "/mnt/books" - opts: "rw,uid={{ qbittorrent_puid }},gid={{ qbittorrent_pgid }},file_mode=0777,dir_mode=0777,iocharset=utf8,vers=3.0,guest" - - name: films - src: "//192.168.1.203/Films" - dest: "/mnt/video/films" - opts: "rw,uid={{ qbittorrent_puid }},gid={{ qbittorrent_pgid }},file_mode=0777,dir_mode=0777,iocharset=utf8,vers=3.0,guest" - - name: mult - src: "//192.168.1.203/Mult" - dest: "/mnt/video/mult" - opts: "rw,uid={{ qbittorrent_puid }},gid={{ qbittorrent_pgid }},file_mode=0777,dir_mode=0777,iocharset=utf8,vers=3.0,guest" - - name: anime - src: "//192.168.1.203/Anime" - dest: "/mnt/video/anime" - opts: "rw,uid={{ qbittorrent_puid }},gid={{ qbittorrent_pgid }},file_mode=0777,dir_mode=0777,iocharset=utf8,vers=3.0,guest" - - name: serial - src: "//192.168.1.203/Serial" - dest: "/mnt/video/serial" - opts: "rw,uid={{ qbittorrent_puid }},gid={{ qbittorrent_pgid }},file_mode=0777,dir_mode=0777,iocharset=utf8,vers=3.0,guest" - - name: mserials - src: "//192.168.1.203/Mserials" - dest: "/mnt/video/mserials" - opts: "rw,uid={{ qbittorrent_puid }},gid={{ qbittorrent_pgid }},file_mode=0777,dir_mode=0777,iocharset=utf8,vers=3.0,guest" - - name: doc - src: "//192.168.1.203/Doc" - dest: "/mnt/documents" - opts: "rw,uid={{ qbittorrent_puid }},gid={{ qbittorrent_pgid }},file_mode=0777,dir_mode=0777,iocharset=utf8,vers=3.0,guest" - - name: ztube - src: "//192.168.1.203/Ztube" - dest: "/mnt/video/ztube" - opts: "rw,uid={{ qbittorrent_puid }},gid={{ qbittorrent_pgid }},file_mode=0777,dir_mode=0777,iocharset=utf8,vers=3.0,guest" - - name: show - src: "//192.168.1.203/Show" - dest: "/mnt/video/show" - opts: "rw,uid={{ qbittorrent_puid }},gid={{ qbittorrent_pgid }},file_mode=0777,dir_mode=0777,iocharset=utf8,vers=3.0,guest" - - name: games - src: "//192.168.1.207/Games" - dest: "/mnt/games" - opts: "rw,uid={{ qbittorrent_puid }},gid={{ qbittorrent_pgid }},file_mode=0777,dir_mode=0777,iocharset=utf8,vers=3.0,guest" - -torrserver_base_dir: "/mnt/service/torrserver" -torrserver_config_dir: "{{ torrserver_base_dir }}/config" -torrserver_torrents_dir: "{{ torrserver_base_dir }}/torrents" -torrserver_port: "45136" - flibusta_base_dir: "/mnt/service/flibusta" flibusta_source_archives_dir: "/mnt/books/flibusta" flibusta_web_port: "45137" @@ -388,4 +313,80 @@ gitlab_ssh_port: "2222" gitlab_version: "17.5.5-ce.0" gitlab_hostname: "git.zailon.ru" gitlab_external_url: "https://git.zailon.ru" -gitlab_root_password: "ChangeMe123!" \ No newline at end of file +gitlab_root_password: "ChangeMe123!" + +# ------------ Torrent (192.168.1.211) ------------ +qbittorrent_base_dir: "/mnt/service/qbittorrent" +qbittorrent_config_dir: "{{ qbittorrent_base_dir }}/appdata" +qbittorrent_downloads_dir: "{{ qbittorrent_base_dir }}/downloads" +qbittorrent_puid: 1000 +qbittorrent_pgid: 1000 +qbittorrent_port_webui: 45131 +qbittorrent_port_torrent: 6881 +qbittorrent_user: "qbittorrent" +qbittorrent_password: "13qeadZC" +qbittorrent_smb_credentials_dir: "/etc/smb-creds" +qbittorrent_smb_creds: + olimp: + username: "Olimp" + password: "13qeadZC" + file: "olimp" +qbittorrent_shares: + - name: downloads + src: "//192.168.1.101/Downloads" + dest: "/mnt/downloads" + credential: "olimp" + opts: "rw,uid={{ qbittorrent_puid }},gid={{ qbittorrent_pgid }},file_mode=0777,dir_mode=0777,iocharset=utf8,vers=3.0" + - name: abook + src: "//192.168.1.203/Abook" + dest: "/mnt/video/abook" + opts: "rw,uid={{ qbittorrent_puid }},gid={{ qbittorrent_pgid }},file_mode=0777,dir_mode=0777,iocharset=utf8,vers=3.0,guest" + - name: music + src: "//192.168.1.203/Music" + dest: "/mnt/audio" + opts: "rw,uid={{ qbittorrent_puid }},gid={{ qbittorrent_pgid }},file_mode=0777,dir_mode=0777,iocharset=utf8,vers=3.0,guest" + - name: books + src: "//192.168.1.203/Books" + dest: "/mnt/books" + opts: "rw,uid={{ qbittorrent_puid }},gid={{ qbittorrent_pgid }},file_mode=0777,dir_mode=0777,iocharset=utf8,vers=3.0,guest" + - name: films + src: "//192.168.1.203/Films" + dest: "/mnt/video/films" + opts: "rw,uid={{ qbittorrent_puid }},gid={{ qbittorrent_pgid }},file_mode=0777,dir_mode=0777,iocharset=utf8,vers=3.0,guest" + - name: mult + src: "//192.168.1.203/Mult" + dest: "/mnt/video/mult" + opts: "rw,uid={{ qbittorrent_puid }},gid={{ qbittorrent_pgid }},file_mode=0777,dir_mode=0777,iocharset=utf8,vers=3.0,guest" + - name: anime + src: "//192.168.1.203/Anime" + dest: "/mnt/video/anime" + opts: "rw,uid={{ qbittorrent_puid }},gid={{ qbittorrent_pgid }},file_mode=0777,dir_mode=0777,iocharset=utf8,vers=3.0,guest" + - name: serial + src: "//192.168.1.203/Serial" + dest: "/mnt/video/serial" + opts: "rw,uid={{ qbittorrent_puid }},gid={{ qbittorrent_pgid }},file_mode=0777,dir_mode=0777,iocharset=utf8,vers=3.0,guest" + - name: mserials + src: "//192.168.1.203/Mserials" + dest: "/mnt/video/mserials" + opts: "rw,uid={{ qbittorrent_puid }},gid={{ qbittorrent_pgid }},file_mode=0777,dir_mode=0777,iocharset=utf8,vers=3.0,guest" + - name: doc + src: "//192.168.1.203/Doc" + dest: "/mnt/video/doc" + opts: "rw,uid={{ qbittorrent_puid }},gid={{ qbittorrent_pgid }},file_mode=0777,dir_mode=0777,iocharset=utf8,vers=3.0,guest" + - name: ztube + src: "//192.168.1.203/Ztube" + dest: "/mnt/video/ztube" + opts: "rw,uid={{ qbittorrent_puid }},gid={{ qbittorrent_pgid }},file_mode=0777,dir_mode=0777,iocharset=utf8,vers=3.0,guest" + - name: show + src: "//192.168.1.203/Show" + dest: "/mnt/video/show" + opts: "rw,uid={{ qbittorrent_puid }},gid={{ qbittorrent_pgid }},file_mode=0777,dir_mode=0777,iocharset=utf8,vers=3.0,guest" + - name: games + src: "//192.168.1.207/Games" + dest: "/mnt/games" + opts: "rw,uid={{ qbittorrent_puid }},gid={{ qbittorrent_pgid }},file_mode=0777,dir_mode=0777,iocharset=utf8,vers=3.0,guest" + +torrserver_base_dir: "/mnt/service/torrserver" +torrserver_config_dir: "{{ torrserver_base_dir }}/config" +torrserver_torrents_dir: "{{ torrserver_base_dir }}/torrents" +torrserver_port: "45132" \ No newline at end of file diff --git a/roles/qbittorrent/tasks/main.yml b/roles/qbittorrent/tasks/main.yml index fd63444..e1ab210 100644 --- a/roles/qbittorrent/tasks/main.yml +++ b/roles/qbittorrent/tasks/main.yml @@ -52,28 +52,11 @@ port: "{{ qbittorrent_port_webui }}" timeout: 60 -- name: Настройка пользователя qBittorrent - uri: - url: "http://localhost:{{ qbittorrent_port_webui }}/api/v2/auth/login" - method: POST - body_format: form-urlencoded - body: - username: "admin" - password: "adminadmin" - status_code: 200 - register: login_response - until: login_response.status == 200 - retries: 10 - delay: 5 - -- name: Смена пароля по умолчанию - uri: - url: "http://localhost:{{ qbittorrent_port_webui }}/api/v2/app/setPreferences" - method: POST - body_format: json - body: - json: '{"web_ui":{"username":"{{ qbittorrent_user }}","password":"{{ qbittorrent_password }}","session_timeout":3600}}' - headers: - Cookie: "{{ login_response.set_cookie }}" - status_code: 200 - when: login_response.status == 200 \ No newline at end of file +- name: Информация о подключении + debug: + msg: | + qBittorrent запущен! + Веб-интерфейс: http://{{ ansible_host }}:{{ qbittorrent_port_webui }} + Логин по умолчанию: admin + Пароль по умолчанию: adminadmin + Пожалуйста, смените пароль при первом входе! \ No newline at end of file