working

diyvpn.sh

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