root/F7_HPB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

f7hpb: конфиг в /etc/f7cloud-talk-signaling, overlay server.conf, LF line endings (.gitattributes), fix CRLF

Browse Source
This commit is contained in:
root 2026-03-16 05:00:20 +00:00
parent 52a0d58510
commit 7a1d7c73da
6 changed files with 179 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored Normal file
View File

@ -0,0 +1,2 @@
* text=auto
*.sh text eol=lf

29
f7hpb.sh
View File

@ -83,20 +83,23 @@ if [ -f /tmp/hpb-secrets.env ]; then
fi fi
R=/tmp/F7_HPB R=/tmp/F7_HPB
mkdir -p /etc/f7cloud-spreed-signaling SIGNALING_CONF_DIR="/etc/f7cloud-talk-signaling"
mkdir -p "$SIGNALING_CONF_DIR"
if [ -f "$R/server.conf.example" ]; then if [ -f "$R/overlay/etc/f7cloud-talk-signaling/server.conf" ]; then
cp "$R/server.conf.example" /etc/f7cloud-spreed-signaling/server.conf cp "$R/overlay/etc/f7cloud-talk-signaling/server.conf" "$SIGNALING_CONF_DIR/"
sed -i "s|hashkey = .*|hashkey = \"${HPB_HASHKEY}\"|i" /etc/f7cloud-spreed-signaling/server.conf else
sed -i "s|blockkey = .*|blockkey = \"${HPB_BLOCKKEY}\"|i" /etc/f7cloud-spreed-signaling/server.conf [ -f "$R/server.conf.example" ] && cp "$R/server.conf.example" "$SIGNALING_CONF_DIR/server.conf"
sed -i "s|internalsecret = .*|internalsecret = \"${HPB_INTERNAL_SECRET}\"|i" /etc/f7cloud-spreed-signaling/server.conf fi
sed -i "s|secret = YOUR_NEXTCLOUD_BACKEND_SECRET|secret = \"${HPB_BACKEND_SECRET}\"|g" /etc/f7cloud-spreed-signaling/server.conf if [ -f "$SIGNALING_CONF_DIR/server.conf" ]; then
sed -i "s|url = https://[^ ]*|url = ${F7CLOUD_URL}|" /etc/f7cloud-spreed-signaling/server.conf sed -i "s|hashkey = .*|hashkey = \"${HPB_HASHKEY}\"|i" "$SIGNALING_CONF_DIR/server.conf"
# [turn]: apikey, secret, servers — из переменных, ключи не теряются sed -i "s|blockkey = .*|blockkey = \"${HPB_BLOCKKEY}\"|i" "$SIGNALING_CONF_DIR/server.conf"
sed -i "s|internalsecret = .*|internalsecret = \"${HPB_INTERNAL_SECRET}\"|i" "$SIGNALING_CONF_DIR/server.conf"
sed -i "s|secret = YOUR_NEXTCLOUD_BACKEND_SECRET|secret = \"${HPB_BACKEND_SECRET}\"|g" "$SIGNALING_CONF_DIR/server.conf"
sed -i "s|url = https://[^ ]*|url = ${F7CLOUD_URL}|" "$SIGNALING_CONF_DIR/server.conf"
REALM="${F7CLOUD_URL#*://}"; REALM="${REALM%%/*}"; REALM="${REALM%%:*}" REALM="${F7CLOUD_URL#*://}"; REALM="${REALM%%/*}"; REALM="${REALM%%:*}"
[ -n "$TURN_REST_API_KEY" ] && sed -i "s|apikey = YOUR_TURN_API_KEY|apikey = ${TURN_REST_API_KEY}|" /etc/f7cloud-spreed-signaling/server.conf [ -n "$TURN_REST_API_KEY" ] && sed -i "s|apikey = YOUR_TURN_API_KEY|apikey = ${TURN_REST_API_KEY}|" "$SIGNALING_CONF_DIR/server.conf"
[ -n "$STATIC_AUTH_SECRET" ] && sed -i "s|secret = YOUR_TURN_SHARED_SECRET|secret = ${STATIC_AUTH_SECRET}|" /etc/f7cloud-spreed-signaling/server.conf [ -n "$STATIC_AUTH_SECRET" ] && sed -i "s|secret = YOUR_TURN_SHARED_SECRET|secret = ${STATIC_AUTH_SECRET}|" "$SIGNALING_CONF_DIR/server.conf"
[ -n "$REALM" ] && sed -i "s|servers = turn:.*|servers = turn:${REALM}:9991?transport=udp,turn:${REALM}:9991?transport=tcp|" /etc/f7cloud-spreed-signaling/server.conf [ -n "$REALM" ] && sed -i "s|servers = turn:.*|servers = turn:${REALM}:9991?transport=udp,turn:${REALM}:9991?transport=tcp|" "$SIGNALING_CONF_DIR/server.conf"
fi fi
# Бинарник signaling только из overlay (signaling-server убран как дубликат) # Бинарник signaling только из overlay (signaling-server убран как дубликат)

1
overlay/etc/coturn/.gitkeep
View File

@ -0,0 +1 @@

1
overlay/etc/coturn/certs/.gitkeep
View File

@ -0,0 +1 @@

0
overlay/etc/f7cloud-talk-signaling/.gitkeep Normal file
View File

2
systemd/signaling.service
View File

@ -2,7 +2,7 @@
Description=F7 Talk signaling server Description=F7 Talk signaling server
[Service] [Service]
ExecStart=/usr/bin/signaling --config /etc/f7cloud-spreed-signaling/server.conf ExecStart=/usr/bin/signaling --config /etc/f7cloud-talk-signaling/server.conf
User=_signaling User=_signaling
Group=_signaling Group=_signaling
Restart=on-failure Restart=on-failure