From 53b358eeaac6454cf6a6d6ff01ce2aeb063d652b Mon Sep 17 00:00:00 2001 From: Roman Buryan Date: Wed, 28 Oct 2026 12:26:42 +0300 Subject: [PATCH] =?UTF-8?q?[SECURITY]=20=D0=9F=D0=BE=D1=81=D0=BB=D0=B5?= =?UTF-8?q?=D0=B4=D0=BD=D0=B8=D0=B5=20=D0=BB=D0=B8=D1=82=D0=B5=D1=80=D0=B0?= =?UTF-8?q?=D0=BB=D1=8B:=20Nextcloud,=20Grafana,=20tinyproxy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ops/creds/add_nc_sensors.py | 2 +- ops/scripts/migrate-grafana-v2.sh | 2 +- ops/sprint1/sprint2-tinyproxy.sh | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ops/creds/add_nc_sensors.py b/ops/creds/add_nc_sensors.py index b0b773e..822d5c1 100644 --- a/ops/creds/add_nc_sensors.py +++ b/ops/creds/add_nc_sensors.py @@ -6,7 +6,7 @@ SEC = "/opt/smart-lxc/homeassistant/config/secrets.yaml" sec = open(SEC, encoding="utf-8").read() if "nextcloud_auth" not in sec: import base64 - token = base64.b64encode(b"roman:HubNextcloud2026!").decode() + token = base64.b64encode(("roman:" + open("/root/.nextcloud-admin-pass").read().strip()).encode()).decode() with open(SEC, "a", encoding="utf-8") as f: f.write(f'\nnextcloud_auth: "Basic {token}"\n') print(" секрет Nextcloud добавлен") diff --git a/ops/scripts/migrate-grafana-v2.sh b/ops/scripts/migrate-grafana-v2.sh index e5d7fa8..33f3b06 100755 --- a/ops/scripts/migrate-grafana-v2.sh +++ b/ops/scripts/migrate-grafana-v2.sh @@ -33,7 +33,7 @@ DIR=/opt/grafana GDB=/var/lib/docker/volumes/bb96ab0c4792f406a1d68f4935ff151e8da041c0bbcacb3262de776fd0428df5/_data/grafana.db PGDB=grafana_db PGROLE=grafana_user -PGPASS='Grafana_Local_2026!' +PGPASS="$(cat /root/.grafana-admin-pass)" STAMP=$(date +%Y%m%d_%H%M%S) QUAR="/mnt/backups/retired/${STAMP}-grafana-v2" WORK="/tmp/grafana-v2-$STAMP" diff --git a/ops/sprint1/sprint2-tinyproxy.sh b/ops/sprint1/sprint2-tinyproxy.sh index 9f2b9df..d0a12f7 100755 --- a/ops/sprint1/sprint2-tinyproxy.sh +++ b/ops/sprint1/sprint2-tinyproxy.sh @@ -4,18 +4,21 @@ echo "=== Устанавливаем tinyproxy на VPS ===" ssh root@193.233.210.184 'apt install -y tinyproxy >/dev/null 2>&1; echo installed' echo "=== Конфигурируем (порт 8888, BasicAuth) ===" -ssh root@193.233.210.184 'cat > /etc/tinyproxy/tinyproxy.conf << CONF +CONF_LOCAL=$(mktemp) +cat > "$CONF_LOCAL" << CONF User tinyproxy Group tinyproxy Port 8888 Listen 0.0.0.0 Timeout 600 Allow 46.8.140.0/24 -BasicAuth n8nrelay BuryanRelay2026 +BasicAuth n8nrelay $(cat /root/.proxy-pass) ConnectPort 443 ConnectPort 80 CONF -systemctl restart tinyproxy && systemctl is-active tinyproxy' +scp -q "$CONF_LOCAL" root@193.233.210.184:/etc/tinyproxy/tinyproxy.conf +rm -f "$CONF_LOCAL" +ssh root@193.233.210.184 'systemctl restart tinyproxy && systemctl is-active tinyproxy' echo "=== Открываем порт 8888 в iptables VPS ===" ssh root@193.233.210.184 'iptables -C INPUT -p tcp --dport 8888 -j ACCEPT 2>/dev/null || iptables -I INPUT 1 -p tcp --dport 8888 -j ACCEPT; iptables-save > /etc/iptables/rules.v4; echo ok'