This commit is contained in:
2025-12-02 23:01:44 -05:00
parent 4c29f51fc0
commit a0b0ccfaa1

View File

@@ -20,7 +20,7 @@ generate() {
idle_timeout="${IDLE_TIMEOUT:-10min}" idle_timeout="${IDLE_TIMEOUT:-10min}"
listen_port="${LISTEN_PORT:?LISTEN_PORT should be set}" listen_port="${LISTEN_PORT:?LISTEN_PORT should be set}"
cat > "$opdir/diyvpnssh-$name.service" <<-EOF cat >"$opdir/diyvpnssh-$name.service" <<-EOF
[Unit] [Unit]
Description=ssh to $name Description=ssh to $name
StopWhenUnneeded=yes StopWhenUnneeded=yes
@@ -36,7 +36,7 @@ generate() {
ExecStart=ssh -F "$common_ssh_cfg_path" default ExecStart=ssh -F "$common_ssh_cfg_path" default
EOF EOF
cat > "$opdir/diyvpnact-$name.service" <<-EOF cat >"$opdir/diyvpnact-$name.service" <<-EOF
[Unit] [Unit]
Description=Socket activator for diyvpn to server $name Description=Socket activator for diyvpn to server $name
Requires=diyvpnssh-$name.service Requires=diyvpnssh-$name.service
@@ -47,7 +47,7 @@ generate() {
ExecStart=/usr/lib/systemd/systemd-socket-proxyd --exit-idle-time=$idle_timeout %t/diyvpn-$name/sock ExecStart=/usr/lib/systemd/systemd-socket-proxyd --exit-idle-time=$idle_timeout %t/diyvpn-$name/sock
EOF EOF
cat > "$opdir/diyvpnact-$name.socket" <<-EOF cat >"$opdir/diyvpnact-$name.socket" <<-EOF
[Unit] [Unit]
Description=Socket for diyvpn to server $name Description=Socket for diyvpn to server $name
@@ -57,9 +57,15 @@ generate() {
[Install] [Install]
WantedBy=sockets.target WantedBy=sockets.target
EOF EOF
mkdir -p "$opdir/sockets.target.wants"
ln -snf "../diyvpnact-$name.socket" "$opdir/sockets.target.wants"
} }
for server in "$diyvpn_cfg"/* for server in "$diyvpn_cfg"/*; do
do if [[ -d "$server" ]]; then
(generate "$server" "$opdir") (generate "$server" "$opdir")
else
echo "Ignoring $server. Not a directory."
fi
done done