feat: add new option freshrss_trusted_sources
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
Robert Kaussow 2022-11-25 14:35:31 +01:00
parent 61eb5548a3
commit 276fd3bf54
Signed by: xoxys
GPG Key ID: 4E692A2EAECC03C0
2 changed files with 15 additions and 5 deletions

View File

@ -61,11 +61,14 @@ freshrss_cap_drop: []
freshrss_security_opt: [] freshrss_security_opt: []
# @var freshrss_pids_limit: $ "_unset_" # @var freshrss_pids_limit: $ "_unset_"
freshrss_healthcheck: # @var freshrss_healthcheck: $ "_unset_"
test: '["CMD", "/usr/local/bin/healthcheck"]' # @var freshrss_healthcheck:example: >
interval: 30s # freshrss_healthcheck:
timeout: 5s # test: '["CMD", "/usr/local/bin/healthcheck"]'
retries: 5 # interval: 30s
# timeout: 5s
# retries: 5
# @end
freshrss_default_user: "admin" freshrss_default_user: "admin"
freshrss_default_password: "freshrss" freshrss_default_password: "freshrss"
@ -109,6 +112,10 @@ freshrss_limits_max_registrations: "1"
freshrss_extensions_enabled: freshrss_extensions_enabled:
- "Tumblr-GDPR" - "Tumblr-GDPR"
freshrss_trusted_sources:
- 127.0.0.0/8
- ::1/128
freshrss_db_type: sqlite freshrss_db_type: sqlite
freshrss_db_server: localhost freshrss_db_server: localhost
freshrss_db_port: 5432 freshrss_db_port: 5432

View File

@ -96,6 +96,7 @@ services:
- FRESHRSS_DB_PREFIX=freshrss_ - FRESHRSS_DB_PREFIX=freshrss_
{% endif %} {% endif %}
- FRESHRSS_EXTENSIONS_ENABLED={{ freshrss_extensions_enabled | join(',') }} - FRESHRSS_EXTENSIONS_ENABLED={{ freshrss_extensions_enabled | join(',') }}
- FRESHRSS_TRUSTED_SOURCES={{ freshrss_trusted_sources | join(',') }}
{% if freshrss_memory_limit is defined %} {% if freshrss_memory_limit is defined %}
mem_limit: {{ freshrss_memory_limit }} mem_limit: {{ freshrss_memory_limit }}
{% endif %} {% endif %}
@ -123,10 +124,12 @@ services:
- {{ item }} - {{ item }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% if freshrss_healthcheck is defined %}
healthcheck: healthcheck:
{% for key, value in freshrss_healthcheck.items() %} {% for key, value in freshrss_healthcheck.items() %}
{{ key }}: {{ value }} {{ key }}: {{ value }}
{% endfor %} {% endfor %}
{% endif %}
{% if freshrss_pids_limit is defined %} {% if freshrss_pids_limit is defined %}
pids_limit: {{ freshrss_pids_limit }} pids_limit: {{ freshrss_pids_limit }}
{% endif %} {% endif %}