From 26fe45e0744c08630c8181bd169328c73d6d3b21 Mon Sep 17 00:00:00 2001 From: Will Norris Date: Fri, 7 Jun 2024 11:24:59 -0700 Subject: [PATCH] add missing license headers in go files Files copied from caddy carry the original copyright and license, though we've switched to the shorter (but equivalent) SPDX identifier. Of those, ones the we further modified for our needs also carry a Tailscale copyright. Signed-off-by: Will Norris --- addresses.go | 13 +------------ app.go | 3 +++ app_test.go | 3 +++ auth.go | 3 +++ command.go | 14 ++------------ module.go | 3 +++ module_test.go | 3 +++ transport.go | 3 +++ 8 files changed, 21 insertions(+), 24 deletions(-) diff --git a/addresses.go b/addresses.go index 21da8b4..77a003e 100644 --- a/addresses.go +++ b/addresses.go @@ -1,16 +1,5 @@ // Copyright 2015 Matthew Holt and The Caddy Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// SPDX-License-Identifier: Apache-2.0 package tscaddy diff --git a/app.go b/app.go index 27ed29f..dbcc6d2 100644 --- a/app.go +++ b/app.go @@ -1,3 +1,6 @@ +// Copyright (c) Tailscale Inc & AUTHORS +// SPDX-License-Identifier: Apache-2.0 + package tscaddy // app.go contains App and Node, which provide global configuration for registering Tailscale nodes. diff --git a/app_test.go b/app_test.go index 2896309..655d0f5 100644 --- a/app_test.go +++ b/app_test.go @@ -1,3 +1,6 @@ +// Copyright (c) Tailscale Inc & AUTHORS +// SPDX-License-Identifier: Apache-2.0 + package tscaddy import ( diff --git a/auth.go b/auth.go index 63a73b7..8a24239 100644 --- a/auth.go +++ b/auth.go @@ -1,3 +1,6 @@ +// Copyright (c) Tailscale Inc & AUTHORS +// SPDX-License-Identifier: Apache-2.0 + package tscaddy // auth.go contains the TailscaleAuth module and supporting logic. diff --git a/command.go b/command.go index e34d69b..506845d 100644 --- a/command.go +++ b/command.go @@ -1,16 +1,6 @@ // Copyright 2015 Matthew Holt and The Caddy Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// Copyright (c) Tailscale Inc & AUTHORS +// SPDX-License-Identifier: Apache-2.0 package tscaddy diff --git a/module.go b/module.go index e6bb184..778ab70 100644 --- a/module.go +++ b/module.go @@ -1,3 +1,6 @@ +// Copyright (c) Tailscale Inc & AUTHORS +// SPDX-License-Identifier: Apache-2.0 + // Package tscaddy provides a set of Caddy modules to integrate Tailscale into Caddy. package tscaddy diff --git a/module_test.go b/module_test.go index 680b4d7..107be91 100644 --- a/module_test.go +++ b/module_test.go @@ -1,3 +1,6 @@ +// Copyright (c) Tailscale Inc & AUTHORS +// SPDX-License-Identifier: Apache-2.0 + package tscaddy import ( diff --git a/transport.go b/transport.go index 9a40233..d7e10be 100644 --- a/transport.go +++ b/transport.go @@ -1,3 +1,6 @@ +// Copyright (c) Tailscale Inc & AUTHORS +// SPDX-License-Identifier: Apache-2.0 + package tscaddy // transport.go contains the Transport module.