Merge pull request #400 from jzelinskie/helm-config-update

dist/helm: resync config with values.yaml

dist/helm/chihaya/values.yaml

@@ -14,7 +14,11 @@ config:
   chihaya:
     # The interval communicated with BitTorrent clients informing them how
     # frequently they should announce in between client events.
-    announce_interval: 15m
+    announce_interval: 30m
+
+    # The interval communicated with BitTorrent clients informing them of the
+    # minimal duration between announces.
+    min_announce_interval: 15m
 
     # The network interface that will bind to an HTTP endpoint that can be
     # scraped by an instance of the Prometheus time series database.
@@ -35,15 +39,7 @@ config:
     http:
       # The network interface that will bind to an HTTP server for serving
       # BitTorrent traffic.
-      addr: "0.0.0.0:6881"
-
-      # When enabled, the IP address used to connect to the tracker will not
-      # override the value clients advertise as their IP address.
-      allow_ip_spoofing: false
-
-      # The HTTP Header containing the IP address of the client.
-      # This is only necessary if using a reverse proxy.
-      real_ip_header: "x-real-ip"
+      addr: "0.0.0.0:6969"
 
       # The path to the required files to listen via HTTPS.
       tls_cert_path: ""
@@ -57,16 +53,39 @@ config:
       # Disabling this should increase performance/decrease load.
       enable_request_timing: false
 
+      # Whether to listen on /announce.php and /scrape.php in addition to their
+      # non-.php counterparts.
+      # This is an option for compatibility with (very) old clients or otherwise
+      # outdated systems.
+      # This might be useful to retracker.local users, for more information see
+      # http://rutracker.wiki/Оптимизация_обмена_битторрент_траффиком_в_локальных_сетях
+      # and
+      # http://rutracker.wiki/Retracker.local
+      enable_legacy_php_urls: false
+
+      # When enabled, the IP address used to connect to the tracker will not
+      # override the value clients advertise as their IP address.
+      allow_ip_spoofing: false
+
+      # The HTTP Header containing the IP address of the client.
+      # This is only necessary if using a reverse proxy.
+      real_ip_header: "x-real-ip"
+
+      # The maximum number of peers returned for an individual request.
+      max_numwant: 100
+
+      # The default number of peers returned for an individual request.
+      default_numwant: 50
+
+      # The maximum number of infohashes that can be scraped in one request.
+      max_scrape_infohashes: 50
+
     # This block defines configuration for the tracker's UDP interface.
     # If you do not wish to run this, delete this section.
     udp:
       # The network interface that will bind to a UDP server for serving
       # BitTorrent traffic.
-      addr: "0.0.0.0:6881"
-
-      # When enabled, the IP address used to connect to the tracker will not
-      # override the value clients advertise as their IP address.
-      allow_ip_spoofing: false
+      addr: "0.0.0.0:6969"
 
       # The leeway for a timestamp on a connection ID.
       max_clock_skew: 10s
@@ -78,20 +97,34 @@ config:
       # Disabling this should increase performance/decrease load.
       enable_request_timing: false
 
+      # When enabled, the IP address used to connect to the tracker will not
+      # override the value clients advertise as their IP address.
+      allow_ip_spoofing: false
+
+      # The maximum number of peers returned for an individual request.
+      max_numwant: 100
+
+      # The default number of peers returned for an individual request.
+      default_numwant: 50
+
+      # The maximum number of infohashes that can be scraped in one request.
+      max_scrape_infohashes: 50
+
+
     # This block defines configuration used for the storage of peer data.
     storage:
       name: memory
       config:
         # The frequency which stale peers are removed.
-        gc_interval: 14m
+        gc_interval: 3m
 
         # The amount of time until a peer is considered stale.
         # To avoid churn, keep this slightly larger than `announce_interval`
-        peer_lifetime: 16m
+        peer_lifetime: 31m
 
         # The number of partitions data will be divided into in order to provide a
         # higher degree of parallelism.
-        shards: 1024
+        shard_count: 1024
 
         # The interval at which metrics about the number of infohashes and peers
         # are collected and posted to Prometheus.
@@ -101,21 +134,21 @@ config:
     # response has been returned to a BitTorrent client.
     prehooks:
     #- name: jwt
-    #  config:
+    #  options:
     #    issuer: "https://issuer.com"
     #    audience: "https://chihaya.issuer.com"
     #    jwk_set_url: "https://issuer.com/keys"
     #    jwk_set_update_interval: 5m
 
     #- name: client approval
-    #  config:
+    #  options:
     #    whitelist:
     #    - "OP1011"
     #    blacklist:
     #    - "OP1012"
 
     #- name: interval variation
-    #  config:
+    #  options:
     #    modify_response_probability: 0.2
     #    max_increase_delta: 60
     #    modify_min_interval: true