From 276fd3bf54dde55083f265d9acbc4996d5a03c21 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@thegeeklab.de>
Date: Fri, 25 Nov 2022 14:35:31 +0100
Subject: [PATCH] feat: add new option freshrss_trusted_sources

---
 defaults/main.yml                          | 17 ++++++++++++-----
 templates/services/freshrss_compose.yml.j2 |  3 +++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 96d94d7..7ca3871 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -61,11 +61,14 @@ freshrss_cap_drop: []
 freshrss_security_opt: []
 # @var freshrss_pids_limit: $ "_unset_"
 
-freshrss_healthcheck:
-  test: '["CMD", "/usr/local/bin/healthcheck"]'
-  interval: 30s
-  timeout: 5s
-  retries: 5
+# @var freshrss_healthcheck: $ "_unset_"
+# @var freshrss_healthcheck:example: >
+# freshrss_healthcheck:
+#   test: '["CMD", "/usr/local/bin/healthcheck"]'
+#   interval: 30s
+#   timeout: 5s
+#   retries: 5
+# @end
 
 freshrss_default_user: "admin"
 freshrss_default_password: "freshrss"
@@ -109,6 +112,10 @@ freshrss_limits_max_registrations: "1"
 freshrss_extensions_enabled:
   - "Tumblr-GDPR"
 
+freshrss_trusted_sources:
+  - 127.0.0.0/8
+  - ::1/128
+
 freshrss_db_type: sqlite
 freshrss_db_server: localhost
 freshrss_db_port: 5432
diff --git a/templates/services/freshrss_compose.yml.j2 b/templates/services/freshrss_compose.yml.j2
index bdfa8b4..fd227ab 100644
--- a/templates/services/freshrss_compose.yml.j2
+++ b/templates/services/freshrss_compose.yml.j2
@@ -96,6 +96,7 @@ services:
       - FRESHRSS_DB_PREFIX=freshrss_
       {% endif %}
       - FRESHRSS_EXTENSIONS_ENABLED={{ freshrss_extensions_enabled | join(',') }}
+      - FRESHRSS_TRUSTED_SOURCES={{ freshrss_trusted_sources | join(',') }}
     {% if freshrss_memory_limit is defined %}
     mem_limit: {{ freshrss_memory_limit }}
     {% endif %}
@@ -123,10 +124,12 @@ services:
       - {{ item }}
       {% endfor %}
     {% endif %}
+    {% if freshrss_healthcheck is defined %}
     healthcheck:
     {% for key, value in freshrss_healthcheck.items() %}
       {{ key }}: {{ value }}
     {% endfor %}
+    {% endif %}
     {% if freshrss_pids_limit is defined %}
     pids_limit: {{ freshrss_pids_limit }}
     {% endif %}