From 896c6a49d8498b7cc80771a543f39893b7efe0d8 Mon Sep 17 00:00:00 2001 From: boyska Date: Thu, 16 Aug 2018 11:33:21 +0200 Subject: [PATCH] rss-bridge configurabile live --- docker-compose.yml | 4 ++++ docker/rssbridge-config.php | 44 ++++++++++++++++++++++++++++++++++ docker/rssbridge-whitelist.txt | 1 + dodo.py | 4 +++- 4 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 docker/rssbridge-config.php create mode 100644 docker/rssbridge-whitelist.txt diff --git a/docker-compose.yml b/docker-compose.yml index e625157..d6263d8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -35,6 +35,10 @@ services: build: context: ./rss-bridge/ container_name: feedati_rss_bridge + volumes: + - ./rss-bridge:/app/public/ + - ./docker/rssbridge-config.php:/app/public/config.ini.php:ro + - ./docker/rssbridge-whitelist.txt:/app/public/whitelist.txt:ro ports: - 8001:80 environment: diff --git a/docker/rssbridge-config.php b/docker/rssbridge-config.php new file mode 100644 index 0000000..5909ad8 --- /dev/null +++ b/docker/rssbridge-config.php @@ -0,0 +1,44 @@ +; DO NOT REMOVE THIS LINE + +; This file contains the default settings for RSS-Bridge. Do not change this +; file, it will be replaced on the next update of RSS-Bridge! You can specify +; your own configuration in 'config.ini.php' (copy this file). + +[cache] + +; Allow users to specify custom timeout for specific requests. +; true = enabled +; false = disabled (default) +custom_timeout = false + +[proxy] + +; Sets the proxy url (i.e. "tcp://192.168.0.0:32") +; "" = Proxy disabled (default) +url = "" + +; Sets the proxy name that is shown on the bridge instead of the proxy url. +; "" = Show proxy url +name = "Hidden proxy name" + +; Allow users to disable proxy usage for specific requests. +; true = enabled +; false = disabled (default) +by_bridge = false + +[authentication] + +; Enables authentication for all requests to this RSS-Bridge instance. +; +; Warning: You'll have to upgrade existing feeds after enabling this option! +; +; true = enabled +; false = disabled (default) +enable = false + +; The username for authentication. Insert this name when prompted for login. +username = "" + +; The password for authentication. Insert this password when prompted for login. +; Use a strong password to prevent others from guessing your login! +password = "" diff --git a/docker/rssbridge-whitelist.txt b/docker/rssbridge-whitelist.txt new file mode 100644 index 0000000..72e8ffc --- /dev/null +++ b/docker/rssbridge-whitelist.txt @@ -0,0 +1 @@ +* diff --git a/dodo.py b/dodo.py index f26d7fd..5496146 100644 --- a/dodo.py +++ b/dodo.py @@ -16,7 +16,9 @@ def task_build(): 'uptodate': [up2date_anyimages], 'file_dep': ['docker-compose.yml', 'docker/Dockerfile-tt-rss', 'docker/ttrss-openrc-apache', - 'docker/ttrss-openrc-ttrssupdate'], + 'docker/ttrss-openrc-ttrssupdate', + 'rss-bridge/Dockerfile' + ], 'actions': [COMPOSE + ' build'], 'clean': [run_task_func(task__build_rm), run_task_func(task__build_rmi)],