From 542ce722804a770668072b1017757349ef568634 Mon Sep 17 00:00:00 2001 From: Daniel Wolf Date: Wed, 25 Oct 2023 11:04:05 -0400 Subject: [PATCH] add reuse copyright information --- .reuse/dep5 | 8 ++++++++ LICENSES/ISC.txt | 8 ++++++++ docker-compose.yml | 4 ++++ override/etc/logrotate.d/letsencrypt | 4 ++++ override/etc/logrotate.d/nginx | 4 ++++ override/etc/nginx/nginx.conf | 4 ++++ override/etc/nginx/nginx.d/_cache.inc | 4 ++++ override/etc/nginx/nginx.d/_gzip.inc | 4 ++++ override/etc/nginx/nginx.d/_server_local.inc | 4 ++++ override/etc/nginx/nginx.d/_server_proxy.inc | 4 ++++ override/etc/nginx/nginx.d/_ssl.inc | 4 ++++ override/etc/nginx/nginx.d/default.conf | 4 ++++ override/etc/nginx/nginx.d/proxy.conf | 4 ++++ override/etc/nginx/nginx.d/redirect.conf | 4 ++++ override/etc/periodic/daily/certbot-renew | 3 +++ override/usr/local/bin/certify | 3 +++ 16 files changed, 70 insertions(+) create mode 100644 .reuse/dep5 create mode 100644 LICENSES/ISC.txt diff --git a/.reuse/dep5 b/.reuse/dep5 new file mode 100644 index 0000000..bf6df08 --- /dev/null +++ b/.reuse/dep5 @@ -0,0 +1,8 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: docker-nginx-ssl +Upstream-Contact: Daniel Wolf +Source: https://code.nephatrine.net/NephNET/docker-nginx-ssl + +Files: override/etc/s6-overlay/* +Copyright: 2022 - 2023 Daniel Wolf +License: ISC diff --git a/LICENSES/ISC.txt b/LICENSES/ISC.txt new file mode 100644 index 0000000..b9c199c --- /dev/null +++ b/LICENSES/ISC.txt @@ -0,0 +1,8 @@ +ISC License: + +Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC") +Copyright (c) 1995-2003 by Internet Software Consortium + +Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/docker-compose.yml b/docker-compose.yml index c4574e2..1f3ff68 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2023 Daniel Wolf +# +# SPDX-License-Identifier: ISC + services: nginx: build: . diff --git a/override/etc/logrotate.d/letsencrypt b/override/etc/logrotate.d/letsencrypt index c1792f5..2c4fc07 100644 --- a/override/etc/logrotate.d/letsencrypt +++ b/override/etc/logrotate.d/letsencrypt @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2018 - 2023 Daniel Wolf +# +# SPDX-License-Identifier: ISC + /mnt/config/log/letsencrypt.log { missingok notifempty diff --git a/override/etc/logrotate.d/nginx b/override/etc/logrotate.d/nginx index 5e782a2..b8de97b 100644 --- a/override/etc/logrotate.d/nginx +++ b/override/etc/logrotate.d/nginx @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2018 - 2023 Daniel Wolf +# +# SPDX-License-Identifier: ISC + /mnt/config/log/nginx-access.log /mnt/config/log/nginx-error.log { missingok notifempty diff --git a/override/etc/nginx/nginx.conf b/override/etc/nginx/nginx.conf index e126766..d265e5a 100644 --- a/override/etc/nginx/nginx.conf +++ b/override/etc/nginx/nginx.conf @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2018 - 2023 Daniel Wolf +# +# SPDX-License-Identifier: ISC + daemon off; error_log /mnt/config/log/nginx-error.log warn; worker_processes 4; diff --git a/override/etc/nginx/nginx.d/_cache.inc b/override/etc/nginx/nginx.d/_cache.inc index 636ab37..ff3983c 100644 --- a/override/etc/nginx/nginx.d/_cache.inc +++ b/override/etc/nginx/nginx.d/_cache.inc @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2018 - 2023 Daniel Wolf +# +# SPDX-License-Identifier: ISC + map $remote_addr $cache_status { 127.0.0.1 $upstream_cache_status; default ""; diff --git a/override/etc/nginx/nginx.d/_gzip.inc b/override/etc/nginx/nginx.d/_gzip.inc index 6626424..71cb019 100644 --- a/override/etc/nginx/nginx.d/_gzip.inc +++ b/override/etc/nginx/nginx.d/_gzip.inc @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2018 - 2023 Daniel Wolf +# +# SPDX-License-Identifier: ISC + gzip on; gzip_comp_level 4; gzip_min_length 256; diff --git a/override/etc/nginx/nginx.d/_server_local.inc b/override/etc/nginx/nginx.d/_server_local.inc index c2c5e81..bceb856 100644 --- a/override/etc/nginx/nginx.d/_server_local.inc +++ b/override/etc/nginx/nginx.d/_server_local.inc @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2018 - 2023 Daniel Wolf +# +# SPDX-License-Identifier: ISC + #NOSSL:listen 80; #NOSSL:listen [::]:80; #SSL:listen 443 quic reuseport; diff --git a/override/etc/nginx/nginx.d/_server_proxy.inc b/override/etc/nginx/nginx.d/_server_proxy.inc index 0188790..0c35fc7 100644 --- a/override/etc/nginx/nginx.d/_server_proxy.inc +++ b/override/etc/nginx/nginx.d/_server_proxy.inc @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2018 - 2023 Daniel Wolf +# +# SPDX-License-Identifier: ISC + #NOSSL:listen 80; #NOSSL:listen [::]:80; #SSL:listen 443 quic; diff --git a/override/etc/nginx/nginx.d/_ssl.inc b/override/etc/nginx/nginx.d/_ssl.inc index c43ccfb..d0228e0 100644 --- a/override/etc/nginx/nginx.d/_ssl.inc +++ b/override/etc/nginx/nginx.d/_ssl.inc @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2018 - 2023 Daniel Wolf +# +# SPDX-License-Identifier: ISC + ssl_protocols TLSv1.2 TLSv1.3; ssl_prefer_server_ciphers off; ssl_dhparam /mnt/config/ssl/dhparam.pem; diff --git a/override/etc/nginx/nginx.d/default.conf b/override/etc/nginx/nginx.d/default.conf index 1d33984..424bbdd 100644 --- a/override/etc/nginx/nginx.d/default.conf +++ b/override/etc/nginx/nginx.d/default.conf @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2018 - 2023 Daniel Wolf +# +# SPDX-License-Identifier: ISC + server { server_name _; include /mnt/config/etc/nginx.d/_server_local.inc; diff --git a/override/etc/nginx/nginx.d/proxy.conf b/override/etc/nginx/nginx.d/proxy.conf index 27f3060..5d69462 100644 --- a/override/etc/nginx/nginx.d/proxy.conf +++ b/override/etc/nginx/nginx.d/proxy.conf @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2018 - 2023 Daniel Wolf +# +# SPDX-License-Identifier: ISC + #include /mnt/config/etc/nginx.d/_cache.inc; #server { diff --git a/override/etc/nginx/nginx.d/redirect.conf b/override/etc/nginx/nginx.d/redirect.conf index 0900e49..e897fb5 100644 --- a/override/etc/nginx/nginx.d/redirect.conf +++ b/override/etc/nginx/nginx.d/redirect.conf @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2018 - 2023 Daniel Wolf +# +# SPDX-License-Identifier: ISC + #SSL:server { #SSL: listen 80 default_server; #SSL: listen [::]:80 default_server; diff --git a/override/etc/periodic/daily/certbot-renew b/override/etc/periodic/daily/certbot-renew index fb4be1a..d66bf7e 100755 --- a/override/etc/periodic/daily/certbot-renew +++ b/override/etc/periodic/daily/certbot-renew @@ -1,4 +1,7 @@ #!/command/with-contenv /bin/bash +# SPDX-FileCopyrightText: 2022 - 2023 Daniel Wolf +# +# SPDX-License-Identifier: ISC if [[ -z "${SSLDOMAINS}" && ! -d /mnt/config/ssl ]]; then exit 0 diff --git a/override/usr/local/bin/certify b/override/usr/local/bin/certify index 825d5a3..e8cd8d7 100755 --- a/override/usr/local/bin/certify +++ b/override/usr/local/bin/certify @@ -1,4 +1,7 @@ #!/command/with-contenv /bin/bash +# SPDX-FileCopyrightText: 2022 - 2023 Daniel Wolf +# +# SPDX-License-Identifier: ISC if [[ -z "${SSLDOMAINS}" && ! -d /mnt/config/ssl ]]; then exit 0