s2svpn #2

Merged

jowj merged 4 commits from s2svpn into master

Author	SHA1	Message	Date
jowj	ae78f92fb2	Add lines for configging lazylibrarian/calibre	5 years ago
jowj	8b1da104f8	a bunch of updates, with some new ways of doing old things - no one agreeing on iptables vs ufw vs nftables is confusing.	5 years ago
jowj	d25fb5e79f	Not useful for this branch. unifi relies on a psk.	5 years ago
jowj	60782fbeff	Update ipsec.conf to reflect the attempt at s2s - this isn't working	5 years ago