From eb13a3ab19fc96384981b09a3b2981a63ac77b37 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 20 Jan 2020 10:14:08 +0300 Subject: [PATCH] updating configuration --- Makefile | 13 ++-------- .../apps/light/kitchen_led_controller.yaml | 8 ------ appdaemon/settings/apps/sensors/mosru.yaml | 22 ++++++++-------- appdaemon/settings/apps/test/telegram_test.py | 3 +++ docker-compose.yml | 14 +++++++++-- esphome/settings/watercontrol.yaml | 23 ++++++++++++----- hass/settings/secrets.yaml.sample | 2 ++ hass/settings/ui-lovelace.yaml | 1 - secrets | 2 +- tor/docker/Dockerfile | 13 ++++++++++ tor/docker/torrc | 25 +++++++++++++++++++ 11 files changed, 86 insertions(+), 40 deletions(-) create mode 100644 tor/docker/Dockerfile create mode 100644 tor/docker/torrc diff --git a/Makefile b/Makefile index 4f2265b..9036efe 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ ARGS = `arg="$(filter-out $@,$(MAKECMDGOALS))" && echo $${arg:-${1}}` update_secrets_sample: @echo "Masking passwords..." #hass - @cat hass/settings/secrets.yaml | sed "s/\:.*/\: xxxxxxxxx/g" > hass/settings/secrets.yaml.sample #mask passwords + @cat secrets/hass/settings/secrets.yaml | sed "s/\:.*/\: xxxxxxxxx/g" > hass/settings/secrets.yaml.sample #mask passwords @sed -i "s/latitude:.*/latitude: 1.0/g" hass/settings/secrets.yaml.sample #must be a number @sed -i "s/longitude:.*/longitude: 1.0/g" hass/settings/secrets.yaml.sample #must be a number @sed -i "s/aqara1_mac:.*/aqara1_mac: xxxxxxxxxxxx/g" hass/settings/secrets.yaml.sample #len 12 @@ -29,16 +29,7 @@ update_secrets_sample: @cat zigbee2mqtt/settings/configuration.yaml | sed "s/\:.*/\: xxxxxxxxx/g" > zigbee2mqtt/settings/configuration.yaml.sample #mask passwords -copy_secrets: - @echo "Copying secrets" - @cp hass/settings/secrets.yaml secrets/hass/settings/secrets.yaml - @cd secrets - @git add . - @git diff-index --quiet HEAD || git commit -m "secrets update" - @git push - @cd ../ - -commit: copy_secrets update_secrets_sample +commit: update_secrets_sample git add . git diff-index --quiet HEAD || git commit -m "$(call ARGS,\"updating configuration\")" git push diff --git a/appdaemon/settings/apps/light/kitchen_led_controller.yaml b/appdaemon/settings/apps/light/kitchen_led_controller.yaml index d298aa2..38dc574 100644 --- a/appdaemon/settings/apps/light/kitchen_led_controller.yaml +++ b/appdaemon/settings/apps/light/kitchen_led_controller.yaml @@ -6,13 +6,5 @@ kitchen_led_controller: class: KitchenLedController watch_entity: light.kitchen topic: home/kitchen-led/kitchen-led/state/set - global_dependencies: - - globals - -bath_led_controller: - module: kitchen_led_controller - class: KitchenLedController - watch_entity: light.bath - control_entity: light.philips_led global_dependencies: - globals \ No newline at end of file diff --git a/appdaemon/settings/apps/sensors/mosru.yaml b/appdaemon/settings/apps/sensors/mosru.yaml index 9cfc8fe..b5bc9a5 100644 --- a/appdaemon/settings/apps/sensors/mosru.yaml +++ b/appdaemon/settings/apps/sensors/mosru.yaml @@ -50,17 +50,17 @@ water_sensor: global_dependencies: - globals -water_sender: - class: WaterCounterSender - module: mosru - entity_ids: - hot: sensor.counter_hot - cold: sensor.counter_cold - app: mosru_client - dependencies: - - mosru_client - global_dependencies: - - globals +# water_sender: +# class: WaterCounterSender +# module: mosru +# entity_ids: +# hot: sensor.counter_hot +# cold: sensor.counter_cold +# app: mosru_client +# dependencies: +# - mosru_client +# global_dependencies: +# - globals power_sender: class: PowerCounterSender diff --git a/appdaemon/settings/apps/test/telegram_test.py b/appdaemon/settings/apps/test/telegram_test.py index 84a7e3b..ced65bf 100644 --- a/appdaemon/settings/apps/test/telegram_test.py +++ b/appdaemon/settings/apps/test/telegram_test.py @@ -42,6 +42,9 @@ class TelegramTest(hass.Hass): self.log('Device has no screen present.') return + if "&feature=share" in video_url: + video_url = video_url.replace("&feature=share", '') + # Preparing request headers = { "x-csrf-token": token, diff --git a/docker-compose.yml b/docker-compose.yml index cdda877..65c81af 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -48,6 +48,7 @@ services: container_name: hass volumes: - ./hass/settings:/config + - ./secrets/hass/settings/secrets.yaml:/config/secrets.yaml:ro - ./hass/settings/hosts.txt:/etc/hosts:ro - /etc/localtime:/etc/localtime:ro ports: @@ -59,6 +60,7 @@ services: - mysql - mosquitto - broadlink + - tor network_mode: "host" restart: always healthcheck: @@ -71,6 +73,14 @@ services: options: max-size: 50m + tor: + build: + context: ./tor/docker + container_name: tor + ports: + - "9150:9150" + restart: always + appdaemon: image: monster1025/appdaemon build: @@ -82,7 +92,7 @@ services: - hass volumes: - ./appdaemon/settings:/conf - - ./hass/settings/secrets.yaml:/conf/secrets.yaml:ro + - ./secrets/hass/settings/secrets.yaml:/conf/secrets.yaml:ro - ./hass/settings/hosts.txt:/etc/hosts:ro - /etc/localtime:/etc/localtime:ro restart: always @@ -194,7 +204,7 @@ services: # - "6052:6052" volumes: - ./esphome/settings:/config - - ./hass/settings/secrets.yaml:/config/secrets.yaml:ro + - ./secrets/hass/settings/secrets.yaml:/config/secrets.yaml:ro network_mode: "host" logging: driver: json-file diff --git a/esphome/settings/watercontrol.yaml b/esphome/settings/watercontrol.yaml index 077a76b..0cb5c82 100644 --- a/esphome/settings/watercontrol.yaml +++ b/esphome/settings/watercontrol.yaml @@ -3,9 +3,9 @@ substitutions: devicename: watercontrol upper_devicename: Watercontrol pin_cold: D1 - init_cold: '210.29' + init_cold: '216.08' pin_hot: D2 - init_hot: '109.74' + init_hot: '112.3' water_open_pin: D5 water_close_pin: D3 ultrasonic_echo_pin: D6 @@ -54,23 +54,25 @@ globals: binary_sensor: - platform: gpio - name: pulse_cold + id: pulse_cold pin: number: $pin_cold mode: INPUT_PULLUP filters: - - delayed_off: 100ms + - delayed_on: 1s + - delayed_off: 1s on_press: then: - lambda: 'id(counter_cold_value) += 0.01;' - platform: gpio - name: pulse_hot + id: pulse_hot pin: number: $pin_hot mode: INPUT_PULLUP filters: - - delayed_off: 100ms + - delayed_on: 1s + - delayed_off: 1s on_press: then: - lambda: 'id(counter_hot_value) += 0.01;' @@ -129,3 +131,12 @@ switch: - delay: 5s - switch.turn_off: water_close - lambda: 'id(water_state) = false;' + + - platform: template + name: "Reset" + turn_on_action: + - lambda: 'id(counter_cold_value) = 216.08;' + - lambda: 'id(counter_hot_value) = 112.3;' + turn_off_action: + - lambda: 'id(counter_cold_value) = 216.08;' + - lambda: 'id(counter_hot_value) = 112.3;' diff --git a/hass/settings/secrets.yaml.sample b/hass/settings/secrets.yaml.sample index 602b93c..e465e12 100644 --- a/hass/settings/secrets.yaml.sample +++ b/hass/settings/secrets.yaml.sample @@ -35,8 +35,10 @@ atv4_credentials: xxxxxxxxx ################################### # PROXY SETTINGS # ################################### +# proxy_url: xxxxxxxxx proxy_url: xxxxxxxxx + ################################### # MQTT SETTINGS # ################################### diff --git a/hass/settings/ui-lovelace.yaml b/hass/settings/ui-lovelace.yaml index 6ab274e..3868c38 100644 --- a/hass/settings/ui-lovelace.yaml +++ b/hass/settings/ui-lovelace.yaml @@ -16,7 +16,6 @@ views: - vacuum.xiaomi_vacuum_cleaner - switch.domofon_force_open - switch.wifi_socket - - light.wled - type: entities title: "Гостиная" show_header_toggle: false diff --git a/secrets b/secrets index e3bb1c5..8a0d926 160000 --- a/secrets +++ b/secrets @@ -1 +1 @@ -Subproject commit e3bb1c5a448e0475d2a39bdb5071a4ade17f7670 +Subproject commit 8a0d926ab332ddfe3d641d7ea4739489decc3c27 diff --git a/tor/docker/Dockerfile b/tor/docker/Dockerfile new file mode 100644 index 0000000..2818e8b --- /dev/null +++ b/tor/docker/Dockerfile @@ -0,0 +1,13 @@ +FROM alpine:latest + +RUN apk update \ + && apk upgrade \ + && apk add tor \ + && rm /var/cache/apk/* + +EXPOSE 9150 + +ADD ./torrc /etc/tor/torrc + +USER tor +CMD /usr/bin/tor -f /etc/tor/torrc \ No newline at end of file diff --git a/tor/docker/torrc b/tor/docker/torrc new file mode 100644 index 0000000..cc61d60 --- /dev/null +++ b/tor/docker/torrc @@ -0,0 +1,25 @@ +## The directory for keeping all the keys/etc +DataDirectory /var/lib/tor + +## Tor opens a socks proxy on port 9150 +SocksPort 0.0.0.0:9150 + +## Entry policies to allow/deny SOCKS requests based on IP address. +## SocksPolicy accept 192.168.1.0/24 +SocksPolicy accept * + +## Logs go to stdout at level "notice" +Log notice stdout + +ControlPort 9051 + +# Try for at most NUM seconds when building circuits. If the circuit isn't open in that time, give up on it. (Default: 1 minute.) +CircuitBuildTimeout 5 + +# Send a padding cell every N seconds to keep firewalls from closing our connections while Tor is not in use. +KeepalivePeriod 60 +# Force Tor to consider whether to build a new circuit every NUM seconds. +NewCircuitPeriod 15 +# How many entry guards should we keep at a time? +NumEntryGuards 8 +