new major update

roles/init-server/templates/user/flexget/config.yml.j2

@@ -36,7 +36,7 @@ templates:
 tasks:
   # @NOTE uncommenting aria2 block requires commenting out download and proxy blocks
   populate_folders:
-    {% if download_mode == 'direct' %}
+    {% if flexget.download_mode == 'direct' %}
     proxy:
       https: 'socks5://<< tor.proxy.hostname >>:<< tor.proxy.port >>'
     {% endif %}
@@ -63,7 +63,7 @@ tasks:
     template: limited_series
     {% if flexget.download_mode == 'aria2' %}
     aria2:
-      server: << aria.rpc.hostname >>
+      server: << aria.rpc.hostname | default((fqdn | default(inventory_hostname))) >>
       port: << aria.rpc.port >>
       {% if aria.rpc.secret != None and aria.rpc.secret is defined %}
       secret: << aria.rpc.secret >>
@@ -71,8 +71,8 @@ tasks:
       username: << aria.rpc.credentials.username >>
       password: << aria.rpc.credentials.password >>
       {% endif %}
-      {% if mode == 'prod' %}
-      scheme: << aria.rpc.scheme >>
+      {% if aria.rpc.scheme == 'https' and mode == 'prod' %}
+      scheme: https
       {% else %}
       scheme: http
       {% endif %}
@@ -86,14 +86,14 @@ tasks:
     {% endif %}
   # @NOTE uncommenting aria2 block requires commenting out download and proxy blocks
   fap_queue:
-    {% if download_mode == 'direct' %}
+    {% if flexget.download_mode == 'direct' %}
     proxy:
       https: 'socks5://<< tor.proxy.hostname >>:<< tor.proxy.port >>'
     {% endif %}
     template: porn_vids
     {% if flexget.download_mode == 'aria2' %}
     aria2:
-      server: << aria.rpc.hostname >>
+      server: << aria.rpc.hostname | default((fqdn | default(inventory_hostname))) >>
       port: << aria.rpc.port >>
       {% if aria.rpc.secret != None and aria.rpc.secret is defined %}
       secret: << aria.rpc.secret >>
@@ -102,8 +102,8 @@ tasks:
       username: << aria.rpc.credentials.username >>
       password: << aria.rpc.credentials.password >>
       {% endif %}
-      {% if mode == 'prod' %}
-      scheme: << aria.rpc.scheme >>
+      {% if aria.rpc.scheme == 'https' and mode == 'prod' %}
+      scheme: https
       {% else %}
       scheme: http
       {% endif %}
@@ -117,14 +117,14 @@ tasks:
     {% endif %}
   # @NOTE uncommenting aria2 block requires commenting out download and proxy blocks
   film_queue:
-    {% if download_mode == 'direct' %}
+    {% if flexget.download_mode == 'direct' %}
     proxy:
       https: 'socks5://<< tor.proxy.hostname >>:<< tor.proxy.port >>'
     {% endif %}
     template: feature_films
     {% if flexget.download_mode == 'aria2' %}
     aria2:
-      server: << aria.rpc.hostname >>
+      server: << aria.rpc.hostname | default((fqdn | default(inventory_hostname))) >>
       port: << aria.rpc.port >>
       {% if aria.rpc.secret != None or aria.rpc.secret is defined %}
       secret: << aria.rpc.secret >>
@@ -133,8 +133,8 @@ tasks:
       username: << aria.rpc.credentials.username >>
       password: << aria.rpc.credentials.password >>
       {% endif %}
-      {% if mode == 'prod' %}
-      scheme: << aria.rpc.scheme >>
+      {% if aria.rpc.scheme == 'https' and mode == 'prod' %}
+      scheme: https
       {% else %}
       scheme: http
       {% endif %}