From 60269c33b0a05d3de0fcaebb1c7600971def60a2 Mon Sep 17 00:00:00 2001 From: StudioEtrange Date: Tue, 2 Feb 2021 13:29:19 +0100 Subject: [PATCH] split support for rpc-whitelist and rpc-host-whitelist in separated env var WHITELIST and HOST_WHITELIST --- readme-vars.yml | 7 +++++-- root/etc/cont-init.d/20-config | 13 +++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index d2b4a4f..d4faaf9 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -43,7 +43,8 @@ opt_param_env_vars: - { env_var: "TRANSMISSION_WEB_HOME", env_value: "/combustion-release/", desc: "Specify an alternative UI options are `/combustion-release/`, `/transmission-web-control/`, and `/kettu/` ." } - { env_var: "USER", env_value: "username", desc: "Specify an optional username for the interface" } - { env_var: "PASS", env_value: "password", desc: "Specify an optional password for the interface" } - - { env_var: "WHITELIST", env_value: "iplist", desc: "Specify an optional list of comma separated host whitelist"} + - { env_var: "WHITELIST", env_value: "iplist", desc: "Specify an optional list of comma separated ip whitelist. Fill rpc-whitelist setting."} + - { env_var: "HOST_WHITELIST", env_value: "dnsnane list", desc: "Specify an optional list of comma separated dns name whitelist. Fill rpc-host-whitelist setting."} opt_param_usage_include_vols: false opt_param_usage_include_ports: false opt_param_device_map: false @@ -71,7 +72,9 @@ app_setup_block: | ## Using whitelist - Use `WHITELIST` to enable an ip of whitelist. Both notation `rpc-whitelist` and `rpc-host-whitelist` are supported. When `WHITELIST` is empty the whitelist is disabled. + Use `WHITELIST` to enable a list of ip as whitelist. This enable support for `rpc-whitelist`. When `WHITELIST` is empty support for whitelist is disabled. + + Use `HOST_WHITELIST` to enable an list of dns names as host-whitelist. This enable support for `rpc-host-whitelist`. When `HOST_WHITELIST` is empty support for host-whitelist is disabled. # changelog changelogs: diff --git a/root/etc/cont-init.d/20-config b/root/etc/cont-init.d/20-config index 63d3e8a..f479146 100644 --- a/root/etc/cont-init.d/20-config +++ b/root/etc/cont-init.d/20-config @@ -19,17 +19,22 @@ else fi if [ ! -z "$WHITELIST" ]; then - sed -i '/rpc-host-whitelist-enabled/c\ "rpc-host-whitelist-enabled": true,' /config/settings.json - sed -i "/\"rpc-host-whitelist\"/c\ \"rpc-host-whitelist\": \"$WHITELIST\"," /config/settings.json sed -i '/rpc-whitelist-enabled/c\ "rpc-whitelist-enabled": true,' /config/settings.json sed -i "/\"rpc-whitelist\"/c\ \"rpc-whitelist\": \"$WHITELIST\"," /config/settings.json else - sed -i '/rpc-host-whitelist-enabled/c\ "rpc-host-whitelist-enabled": false,' /config/settings.json - sed -i "/\"rpc-host-whitelist\"/c\ \"rpc-host-whitelist\": \"$WHITELIST\"," /config/settings.json sed -i '/rpc-whitelist-enabled/c\ "rpc-whitelist-enabled": false,' /config/settings.json sed -i "/\"rpc-whitelist\"/c\ \"rpc-whitelist\": \"$WHITELIST\"," /config/settings.json fi +if [ ! -z "$HOST_WHITELIST" ]; then + sed -i '/rpc-host-whitelist-enabled/c\ "rpc-host-whitelist-enabled": true,' /config/settings.json + sed -i "/\"rpc-host-whitelist\"/c\ \"rpc-host-whitelist\": \"$WHITELIST\"," /config/settings.json +else + sed -i '/rpc-host-whitelist-enabled/c\ "rpc-host-whitelist-enabled": false,' /config/settings.json + sed -i "/\"rpc-host-whitelist\"/c\ \"rpc-host-whitelist\": \"$WHITELIST\"," /config/settings.json +fi + + # permissions chown abc:abc \ /config/settings.json \