Pi-hole/pivpn
Pi-hole/pivpn
1
0
Fork 0
mirror of https://github.com/pivpn/pivpn.git synced 2024-12-18 19:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add systemd override for wg-quick units that don't yet implement reload

Browse source 
- Discussed on pull request 1164
This commit is contained in:
Orazio 2020-10-24 13:41:07 +02:00
parent 9955f1fc02
commit d860f1d402
3 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
auto_install/install.sh
View file

@ -2037,6 +2037,13 @@ confOVPN(){
} }
confWireGuard(){ confWireGuard(){
# Reload job type is not yet available in wireguard-tools shipped with Ubuntu 20.04
if ! grep -q 'ExecReload' /usr/lib/systemd/system/wg-quick@.service; then
echo "::: Adding additional reload job type for wg-quick unit"
$SUDOE install -m 644 "${pivpnFilesDir}"/files/etc/systemd/system/wg-quick@.service.d/override.conf /etc/systemd/system/wg-quick@.service.d/override.conf
$SUDO systemctl daemon-reload
fi
if [ -d /etc/wireguard ]; then if [ -d /etc/wireguard ]; then
# Backup the wireguard folder # Backup the wireguard folder
WIREGUARD_BACKUP="wireguard_$(date +%Y-%m-%d-%H%M%S).tar.gz" WIREGUARD_BACKUP="wireguard_$(date +%Y-%m-%d-%H%M%S).tar.gz"

2
files/etc/systemd/system/wg-quick@.service.d/override.conf Normal file
View file

@ -0,0 +1,2 @@
[Service]
ExecReload=/bin/bash -c 'exec /usr/bin/wg syncconf %i <(exec /usr/bin/wg-quick strip %i)'

4
scripts/uninstall.sh
View file

@ -146,6 +146,10 @@ removeAll(){
${UPDATE_PKG_CACHE} &> /dev/null & spinner $! ${UPDATE_PKG_CACHE} &> /dev/null & spinner $!
fi fi
if [ -f /etc/systemd/system/wg-quick@.service.d/override.conf ]; then
rm -f /etc/systemd/system/wg-quick@.service.d/override.conf
fi
elif [ "${i}" = "unattended-upgrades" ]; then elif [ "${i}" = "unattended-upgrades" ]; then
rm -rf /var/log/unattended-upgrades rm -rf /var/log/unattended-upgrades