Template peer info appended to the server config #345

nonk123 · 2024-07-12T08:49:06Z

I have read the contributing guideline and understand that I have made the correct modifications

Description:

[Peer] blocks inside wg0.conf used to be hardcoded. But there are very specific usecases where this might not be desirable. So, these blocks are now templated.

Benefits of this PR and context:

Closes #335.

How Has This Been Tested?

Running this command produced equivalent configuration files before and after the changes made, except the friendly_name = line:

docker run -d \
  --name=wireguard \
  --cap-add=NET_ADMIN \
  --cap-add=SYS_MODULE \
  -e PUID=1000 \
  -e PGID=1000 \
  -e TZ=Europe/Moscow \
  -e SERVERPORT=51820 \
  -e PEERS=TheA,TheB,TheC \
  -e INTERNAL_SUBNET=10.13.13.0 `#optional` \
  -e ALLOWEDIPS=0.0.0.0/0 `#optional` \
  -e PERSISTENTKEEPALIVE_PEERS=TheC \
  -e LOG_CONFS=true `#optional` \
  -p 51820:51820/udp \
  -v wg-thing:/config \
  -v /lib/modules:/lib/modules `#optional` \
  --sysctl="net.ipv4.conf.all.src_valid_mark=1" \
  --restart unless-stopped \
  lscr.io/linuxserver/wireguard:latest

Here's a diff with some dummy keys:

4c4
< PrivateKey = SKO8MxSnzOCPiNoq/HIvyATfnksEINWKXk4IC4Kp3mk=
---
> PrivateKey = iIh6dFt4IJ3DwKp8GvZh2+DUWwUWp2IJD/sYAART/ks=
9,11c9,11
< # peer_TheA
< PublicKey = dS3HgHgvrFmjKlPlcB8juERrTHu2WlL5kSipLODgaDk=
< PresharedKey = zRC7UcvqIWIIsVchmtsSAYC4Qa1G+OPLXdBMHUUulS0=
---
> # friendly_name = peer_TheA
> PublicKey = 3+zJGVJp+Pmtw5aKXg5hH00X79vmV7FV7yoioB3mvE0=
> PresharedKey = OeE/fo4SI4KYwrSATVDViba50If7t635aZFcTeCWBMk=
15,17c15,17
< # peer_TheB
< PublicKey = mUEENNG9zXmq8RO4qdHkcbkO0h2mSYT1ewbyOebQVgQ=
< PresharedKey = svDHI0L1NpVYwrpsNguxJW0+bqNzXFMCp/fCd6QBD2s=
---
> # friendly_name = peer_TheB
> PublicKey = B13Es6dp2QtcNlUi5yxKZQHCkl7n0rMzgosBKCKyBXE=
> PresharedKey = mOrHbrB4NdoOjgZIxXy/UmwBhtK1kfen6lXdIesJgSk=
21,23c21,23
< # peer_TheC
< PublicKey = NgrQMdiotUWc3KP9xgTHur8KEoCvILTq0mIO78e8fkA=
< PresharedKey = /a7lxaQFOGiI+sC72dIghwHsSAfpCdc/btTweM6LK20=
---
> # friendly_name = peer_TheC
> PublicKey = 5SF4exknx+na5gPpGf9KAkgVy806npfRmKob9eg4wBE=
> PresharedKey = yDoiF2IVwCZRMNqQcudjDw2nwdKfKMRjrsM1qdlwczE=

Source / References:

See: #335.

github-actions

Thanks for opening this pull request! Be sure to follow the pull request template!

LinuxServer-CI · 2024-07-12T08:51:35Z