From owner-svn-ports-all@freebsd.org Mon Mar 30 19:18:13 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 98FE82649CB; Mon, 30 Mar 2020 19:18:13 +0000 (UTC) (envelope-from decke@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48rj0j2Qh1z4QxB; Mon, 30 Mar 2020 19:18:13 +0000 (UTC) (envelope-from decke@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 21B4121C23; Mon, 30 Mar 2020 19:18:04 +0000 (UTC) (envelope-from decke@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02UJI3dO038287; Mon, 30 Mar 2020 19:18:03 GMT (envelope-from decke@FreeBSD.org) Received: (from decke@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02UJI30h038282; Mon, 30 Mar 2020 19:18:03 GMT (envelope-from decke@FreeBSD.org) Message-Id: <202003301918.02UJI30h038282@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: decke set sender to decke@FreeBSD.org using -f From: Bernhard Froehlich Date: Mon, 30 Mar 2020 19:18:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529909 - in head/net/wireguard: . files X-SVN-Group: ports-head X-SVN-Commit-Author: decke X-SVN-Commit-Paths: in head/net/wireguard: . files X-SVN-Commit-Revision: 529909 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Mar 2020 19:18:13 -0000 Author: decke Date: Mon Mar 30 19:18:03 2020 New Revision: 529909 URL: https://svnweb.freebsd.org/changeset/ports/529909 Log: net/wireguard: Implement reload command in rc.d script to reload all peer and key settings without restarting the daemon to avoid interface up/down and loosing traffic. This does not work if you change the Address= line in the [Interface] section which needs a real restart. PR: 244862 Submitted by: david@isnic.is Modified: head/net/wireguard/Makefile head/net/wireguard/files/wireguard.in Modified: head/net/wireguard/Makefile ============================================================================== --- head/net/wireguard/Makefile Mon Mar 30 19:15:32 2020 (r529908) +++ head/net/wireguard/Makefile Mon Mar 30 19:18:03 2020 (r529909) @@ -2,7 +2,7 @@ PORTNAME= wireguard PORTVERSION= 1.0.20200319 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net net-vpn MASTER_SITES= https://git.zx2c4.com/wireguard-tools/snapshot/ DISTNAME= wireguard-tools-${PORTVERSION} Modified: head/net/wireguard/files/wireguard.in ============================================================================== --- head/net/wireguard/files/wireguard.in Mon Mar 30 19:15:32 2020 (r529908) +++ head/net/wireguard/files/wireguard.in Mon Mar 30 19:18:03 2020 (r529909) @@ -19,9 +19,11 @@ name=wireguard rcvar=wireguard_enable +extra_commands="reload" start_cmd="${name}_start" stop_cmd="${name}_stop" +reload_cmd="${name}_reload" wireguard_start() { @@ -36,6 +38,18 @@ wireguard_stop() { for interface in ${wireguard_interfaces}; do %%PREFIX%%/bin/wg-quick down ${interface} + done +} + +wireguard_reload() +{ + ${wireguard_env:+eval export $wireguard_env} + + for interface in ${wireguard_interfaces}; do + tmpfile="`mktemp`" + %%PREFIX%%/bin/wg-quick strip ${interface} > ${tmpfile} + %%PREFIX%%/bin/wg syncconf ${interface} ${tmpfile} + rm -f ${tmpfile} done }