diff options
-rw-r--r-- | COPYING | 14 | ||||
-rw-r--r-- | Cargo.toml | 2 | ||||
-rw-r--r-- | LICENSE (renamed from LICENSE.LGPL3) | 0 | ||||
-rwxr-xr-x | dist/procd/wgconfd | 3 | ||||
-rw-r--r-- | src/config.rs | 4 | ||||
-rw-r--r-- | src/fileutil.rs | 4 | ||||
-rw-r--r-- | src/main.rs | 4 | ||||
-rw-r--r-- | src/manager/builder.rs | 4 | ||||
-rw-r--r-- | src/manager/mod.rs | 4 | ||||
-rw-r--r-- | src/manager/updater.rs | 4 | ||||
-rw-r--r-- | src/model.rs | 4 | ||||
-rw-r--r-- | src/model/ip.rs | 4 | ||||
-rw-r--r-- | src/proto.rs | 4 | ||||
-rw-r--r-- | src/wg.rs | 4 |
14 files changed, 26 insertions, 33 deletions
diff --git a/COPYING b/COPYING deleted file mode 100644 index aca2a6a..0000000 --- a/COPYING +++ /dev/null @@ -1,14 +0,0 @@ -wgconfd is free software: you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License as -published by the Free Software Foundation, either version 3 of the -License, or (at your option) any later version. - -wgconfd is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License (a file named "LICENSE.LGPL3") and a copy of the GNU General -Public License (a file named "LICESNSE.GPL3") along with wgconfd. -If not, see <https://www.gnu.org/licenses/>. @@ -3,7 +3,7 @@ name = "wgconfd" version = "0.2.0" edition = "2018" authors = [ "Hristo Venev <hristo@venev.name>" ] -license = "LGPL-3.0" +license = "LGPL-3.0-or-later" description = "A configuration manager for WireGuard" repository = "https://git.venev.name/hristo/wgconfd" readme = "README.md" diff --git a/dist/procd/wgconfd b/dist/procd/wgconfd index 9cfd438..41718c5 100755 --- a/dist/procd/wgconfd +++ b/dist/procd/wgconfd @@ -1,4 +1,7 @@ #!/bin/sh /etc/rc.common +# SPDX-License-Identifier: LGPL-3.0-or-later +# +# Copyright 2019 Hristo Venev START=50 STOP=50 diff --git a/src/config.rs b/src/config.rs index 95e80a8..b755739 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,6 +1,6 @@ -// Copyright 2019 Hristo Venev +// SPDX-License-Identifier: LGPL-3.0-or-later // -// See COPYING. +// Copyright 2019 Hristo Venev use crate::model::{Ipv4Set, Ipv6Set, Key}; use serde_derive; diff --git a/src/fileutil.rs b/src/fileutil.rs index 0bbafc0..0d76dfe 100644 --- a/src/fileutil.rs +++ b/src/fileutil.rs @@ -1,3 +1,7 @@ +// SPDX-License-Identifier: LGPL-3.0-or-later +// +// Copyright 2019 Hristo Venev + use std::ffi::OsString; #[cfg(unix)] use std::os::unix::fs::OpenOptionsExt; diff --git a/src/main.rs b/src/main.rs index 731357f..0a6e356 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,6 +1,6 @@ -// Copyright 2019 Hristo Venev +// SPDX-License-Identifier: LGPL-3.0-or-later // -// See COPYING. +// Copyright 2019 Hristo Venev #![deny(rust_2018_idioms)] diff --git a/src/manager/builder.rs b/src/manager/builder.rs index a5f04f2..037d2a9 100644 --- a/src/manager/builder.rs +++ b/src/manager/builder.rs @@ -1,6 +1,6 @@ -// Copyright 2019 Hristo Venev +// SPDX-License-Identifier: LGPL-3.0-or-later // -// See COPYING. +// Copyright 2019 Hristo Venev use super::Source; use crate::{config, model, proto}; diff --git a/src/manager/mod.rs b/src/manager/mod.rs index 9afce72..0d180a6 100644 --- a/src/manager/mod.rs +++ b/src/manager/mod.rs @@ -1,6 +1,6 @@ -// Copyright 2019 Hristo Venev +// SPDX-License-Identifier: LGPL-3.0-or-later // -// See COPYING. +// Copyright 2019 Hristo Venev use crate::{config, fileutil, model, proto, wg}; use std::ffi::OsString; diff --git a/src/manager/updater.rs b/src/manager/updater.rs index 67ed953..0245e95 100644 --- a/src/manager/updater.rs +++ b/src/manager/updater.rs @@ -1,6 +1,6 @@ -// Copyright 2019 Hristo Venev +// SPDX-License-Identifier: LGPL-3.0-or-later // -// See COPYING. +// Copyright 2019 Hristo Venev use super::Source; use crate::{config, fileutil, proto}; diff --git a/src/model.rs b/src/model.rs index 90f9b44..8ae4f6a 100644 --- a/src/model.rs +++ b/src/model.rs @@ -1,6 +1,6 @@ -// Copyright 2019 Hristo Venev +// SPDX-License-Identifier: LGPL-3.0-or-later // -// See COPYING. +// Copyright 2019 Hristo Venev // FIXME: arrayref needs to silence this per-expression #![allow(clippy::eval_order_dependence)] diff --git a/src/model/ip.rs b/src/model/ip.rs index 490dada..602c1aa 100644 --- a/src/model/ip.rs +++ b/src/model/ip.rs @@ -1,6 +1,6 @@ -// Copyright 2019 Hristo Venev +// SPDX-License-Identifier: LGPL-3.0-or-later // -// See COPYING. +// Copyright 2019 Hristo Venev use serde; use std::iter::{FromIterator, IntoIterator}; diff --git a/src/proto.rs b/src/proto.rs index 07717b7..9421e53 100644 --- a/src/proto.rs +++ b/src/proto.rs @@ -1,6 +1,6 @@ -// Copyright 2019 Hristo Venev +// SPDX-License-Identifier: LGPL-3.0-or-later // -// See COPYING. +// Copyright 2019 Hristo Venev use crate::model::{Endpoint, Ipv4Net, Ipv6Net, Key}; use serde_derive; @@ -1,6 +1,6 @@ -// Copyright 2019 Hristo Venev +// SPDX-License-Identifier: LGPL-3.0-or-later // -// See COPYING. +// Copyright 2019 Hristo Venev use crate::{fileutil, model}; use std::ffi::{OsStr, OsString}; |