flexget:replace secrets with variables

diff --git a/flexget/config.yml b/flexget/config.yml
index e55be9fb07be0cbfc3a76809ec9705d9ad513392..0646f438dcfbb61c9e7a893fc585d0fd768d2d9e 100644 (file)
--- a/flexget/config.yml
+++ b/flexget/config.yml
@@ -1,4 +1,4 @@
-secrets: private.yml
+variables: private.yml
 
 
 templates: # {{{1
@@ -27,22 +27,22 @@ templates: # {{{1
 
   usenet: # {{{2
     sabnzbd:
-      key: '{{secrets.sabnzbd.key}}'
-      url: '{{secrets.sabnzbd.url}}'
+      key: '{?sabnzbd.key?}'
+      url: '{?sabnzbd.url?}'
 
 
   usenet-movies: # {{{2
     inputs:
-      - rss: { url: 'https://www.usenet-crawler.com/rss?t=2040&dl=1&num=100{{secrets.crawler.api}}', silent: yes } # Movies HD
-      - rss: { url: 'https://newztown.co.za/rss?t=2040&dl=1&num=100{{secrets.newztown.api}}', silent: yes } # Movies HD
-      - rss: { url: 'https://api.drunkenslug.com/rss?t=2040&dl=1&num=100{{secrets.drunkenslug.api}}', silent: yes } # Movies HD
+      - rss: { url: 'https://www.usenet-crawler.com/rss?t=2040&dl=1&num=100{?crawler.api?}', silent: yes } # Movies HD
+      - rss: { url: 'https://newztown.co.za/rss?t=2040&dl=1&num=100{?newztown.api?}', silent: yes } # Movies HD
+      - rss: { url: 'https://api.drunkenslug.com/rss?t=2040&dl=1&num=100{?drunkenslug.api?}', silent: yes } # Movies HD
 
 
   usenet-tv: # {{{2
     inputs:
-      - rss: { url: 'https://www.usenet-crawler.com/rss?t=5030,5040&dl=1&num=100{{secrets.crawler.api}}', silent: yes } # TV SD/HD
-      - rss: { url: 'https://newztown.co.za/rss?t=5030,5040&dl=1&num=100{{secrets.newztown.api}}', silent: yes } # TV SD/HD
-      - rss: { url: 'https://api.drunkenslug.com/rss?t=2040&dl=1&num=100{{secrets.drunkenslug.api}}', silent: yes } # Movies HD
+      - rss: { url: 'https://www.usenet-crawler.com/rss?t=5030,5040&dl=1&num=100{?crawler.api?}', silent: yes } # TV SD/HD
+      - rss: { url: 'https://newztown.co.za/rss?t=5030,5040&dl=1&num=100{?newztown.api?}', silent: yes } # TV SD/HD
+      - rss: { url: 'https://api.drunkenslug.com/rss?t=2040&dl=1&num=100{?drunkenslug.api?}', silent: yes } # Movies HD
 
 
   filters: # {{{2
@@ -144,8 +144,8 @@ templates: # {{{1
     configure_series:
       from:
         trakt_list:
-          username: '{{secrets.trakt.username}}'
-          account: '{{secrets.trakt.account}}'
+          username: '{?trakt.username?}'
+          account: '{?trakt.account?}'
           list: followlist
           type: shows
       settings: *default_settings
@@ -155,8 +155,8 @@ templates: # {{{1
     configure_series:
       from:
         trakt_list:
-          username: '{{secrets.trakt.username}}'
-          account: '{{secrets.trakt.account}}'
+          username: '{?trakt.username?}'
+          account: '{?trakt.account?}'
           list: backfill
           type: shows
       settings: # *default_settings
@@ -166,15 +166,15 @@ templates: # {{{1
       interval: 1 hours
       what:
         - trakt_list:
-            username: '{{secrets.trakt.username}}'
-            account: '{{secrets.trakt.account}}'
+            username: '{?trakt.username?}'
+            account: '{?trakt.account?}'
             list: backfill
             type: episodes
         - next_series_episodes:
             from_start: yes
       from:
         - newznab:
-            url: 'https://www.usenet-crawler.com/api?apikey={{secrets.crawler.apikey}}&t=tvsearch&cat=5030,5040&extended=1'
+            url: 'https://www.usenet-crawler.com/api?apikey={?crawler.apikey?}&t=tvsearch&cat=5030,5040&extended=1'
             category: tv
     all_series: yes
 
@@ -222,7 +222,7 @@ templates: # {{{1
   #       - emit_movie_queue: yes
   #     from:
   #       - newznab:
-  #           url: 'https://www.usenet-crawler.com/api?apikey={{secrets.crawler.apikey}}&t=movie&extended=1&cat=2040'
+  #           url: 'https://www.usenet-crawler.com/api?apikey={?crawler.apikey?}&t=movie&extended=1&cat=2040'
   #           category: movie
   #     interval: 7 days  # search each entry only once a week
 
@@ -230,8 +230,8 @@ templates: # {{{1
   trakt-add-collection: # {{{2
     list_add:
       - trakt_list:
-          username: '{{secrets.trakt.username}}'
-          account: '{{secrets.trakt.account}}'
+          username: '{?trakt.username?}'
+          account: '{?trakt.account?}'
           list: collection
 
 
@@ -261,8 +261,8 @@ tasks: # {{{1
   # dl-movies-trakt: # {{{2
   #   priority: 10
   #   trakt_list:
-  #     username: '{{secrets.trakt.username}}'
-  #     account: '{{secrets.trakt.account}}'
+  #     username: '{?trakt.username?}'
+  #     account: '{?trakt.account?}'
   #     list: watchlist
   #     type: movies
   #   accept_all: yes
@@ -277,8 +277,8 @@ tasks: # {{{1
   #   crossmatch:
   #     from:
   #       - trakt_list:
-  #           username: '{{secrets.trakt.username}}'
-  #           account: '{{secrets.trakt.account}}'
+  #           username: '{?trakt.username?}'
+  #           account: '{?trakt.account?}'
   #           list: watchlist
   #           type: movies
   #     fields: [imdb_id]