From 5ec4c5ee2d202d727c39a786a4d94fbb06dddb26 Mon Sep 17 00:00:00 2001
From: Arky <hitmanarky@gmail.com>
Date: Mon, 20 Aug 2018 15:51:47 +0700
Subject: [PATCH] Correct handling strings/numbers in templates, systemd
 transmission user/group

---
 roles/transmission/README.rst                 |  4 ++++
 roles/transmission/defaults/main.yml          |  9 +++++----
 roles/transmission/tasks/main.yml             |  9 ++++-----
 roles/transmission/templates/settings.json.j2 | 11 +++++------
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/roles/transmission/README.rst b/roles/transmission/README.rst
index 466a83300..f7680ee0f 100644
--- a/roles/transmission/README.rst
+++ b/roles/transmission/README.rst
@@ -42,6 +42,10 @@ $ transmission-remote -a <path_to_the.torrent>
 
 Known Issues
 -------------
+* Default Transmission user/group (See https://github.com/transmission/transmission/issues/537)
+Currently  you need to set these these in "transmission_user" and "transmission_group" variables. You can check
+the value for these in transmission-daemon systemd unit file "lib/systemd/system/transmission-daemon.service"
+* Random Ports
 Currently it is not possible to use random ports in the range 65535-49152. It is difficult to open multiple ports in IIAB firewall.
 
 
diff --git a/roles/transmission/defaults/main.yml b/roles/transmission/defaults/main.yml
index c6f2f35ae..ba9c6929e 100644
--- a/roles/transmission/defaults/main.yml
+++ b/roles/transmission/defaults/main.yml
@@ -6,13 +6,14 @@ transmission_install: False
 transmission_enabled: False
 
 # Transmission default download directory.
-transmission_download_dir: /library/transmission
+transmission_download_dir: "/library/transmission/"
 
 # Transmission default web and bittorrent ports http://box:9091/transmission/
-# TODO: BUG transmission_http_port is not assigned in settings.json?
 transmission_http_port: 9091
 transmission_peer_port: 51413
 transmission_url : "/transmission/"
+transmission_user: debian-transmission
+transmission_group: root
 
 # Provision Transmission with default torrents from http://pantry.learningequality.org/downloads/ka-lite/0.17/content/
 transmission_provision: True
@@ -20,9 +21,9 @@ transmission_kalite_version: 0.17
 # Uncomment to enable a language to download.
 transmission_kalite_languages:
   - english
-  - french
+  #- french
   #- hindi
-  - portugal-portuguese
+  #- portugal-portuguese
   #- brazilian-portuguese
   #- spanish
   #- swahili
diff --git a/roles/transmission/tasks/main.yml b/roles/transmission/tasks/main.yml
index 96d712814..a71f831ee 100644
--- a/roles/transmission/tasks/main.yml
+++ b/roles/transmission/tasks/main.yml
@@ -2,8 +2,8 @@
 - name: Create Transmission download directory
   file:
     path: "{{ item }}"
-    owner: root
-    group: root
+    owner: "{{ transmission_user }}"
+    group: "{{ transmission_group }}"
     mode: 0755
     state: directory
   with_items:
@@ -27,8 +27,8 @@
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
     mode: "{{ item.mode }}"
-    owner: root
-    group: root
+    owner: "{{ transmission_user }}"
+    group: "{{ transmission_group }}"
   with_items:
     - { src: 'settings.json.j2', dest: '/etc/transmission-daemon/settings.json', mode: '0644' }
 
@@ -52,7 +52,6 @@
     state: stopped
   when: not transmission_enabled
 
-
 - name: Add transmission to list of services at /etc/iiab/iiab.ini
   ini_file:
     dest: "{{ service_filelist }}"
diff --git a/roles/transmission/templates/settings.json.j2 b/roles/transmission/templates/settings.json.j2
index 03da5036b..d0c54402e 100644
--- a/roles/transmission/templates/settings.json.j2
+++ b/roles/transmission/templates/settings.json.j2
@@ -12,7 +12,7 @@
     "blocklist-url": "http://www.example.com/blocklist",
     "cache-size-mb": 4,
     "dht-enabled": true,
-    "download-dir": {{ transmission_download_dir }},
+    "download-dir": "{{ transmission_download_dir }}",
     "download-limit": 100,
     "download-limit-enabled": 0,
     "download-queue-enabled": true,
@@ -29,7 +29,7 @@
     "peer-id-ttl-hours": 6,
     "peer-limit-global": 200,
     "peer-limit-per-torrent": 50,
-    "peer-port": {{ transmission_peer_port  }},
+    "peer-port": {{ transmission_peer_port }},
     "peer-port-random-high": 65535,
     "peer-port-random-low": 49152,
     "peer-port-random-on-start": false,
@@ -48,11 +48,10 @@
     "rpc-enabled": true,
     "rpc-host-whitelist": "",
     "rpc-host-whitelist-enabled": true,
-    "rpc-password": {{ transmission_password }},
-    # TODO: BUG transmission_http_port is not assigned in settings.json?
+    "rpc-password": "{{ transmission_password }}",
     "rpc-port": {{ transmission_http_port }},
-    "rpc-url": {{ transmission_url }},
-    "rpc-username": {{ transmission_username }},
+    "rpc-url": "{{ transmission_url }}",
+    "rpc-username": "{{ transmission_username }}",
     "rpc-whitelist": "127.0.0.1",
     "rpc-whitelist-enabled": true,
     "scrape-paused-torrents-enabled": true,