summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--.reuse/dep58
-rw-r--r--ChangeLog3
-rw-r--r--LICENSE20
-rw-r--r--LICENSES/MIT.txt9
-rw-r--r--Makefile3
-rw-r--r--README22
-rw-r--r--README.md26
-rw-r--r--nginx-confgen.c23
9 files changed, 54 insertions, 63 deletions
diff --git a/.gitignore b/.gitignore
index 3c337b0..3dd9039 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: Yoran Heling <projects@yorhel.nl>
+# SPDX-License-Identifier: MIT
*.swp
+*~
nginx-confgen
test/*.test
diff --git a/.reuse/dep5 b/.reuse/dep5
new file mode 100644
index 0000000..4d46c3d
--- /dev/null
+++ b/.reuse/dep5
@@ -0,0 +1,8 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: nginx-confgen
+Upstream-Contact: Yoran Heling <projects@yorhel.nl>
+Source: https://code.blicky.net/yorhel/nginx-confgen
+
+Files: test/*
+Copyright: Yoran Heling <projects@yorhel.nl>
+License: MIT
diff --git a/ChangeLog b/ChangeLog
index 0093d48..df8cda0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: Yoran Heling <projects@yorhel.nl>
+# SPDX-License-Identifier: MIT
+
2.1 - 2022-04-27
- Be more lenient with parsing directive names,
which improves handling of 'map' blocks
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 7467ebc..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2018-2022 Yoran Heling
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/LICENSES/MIT.txt b/LICENSES/MIT.txt
new file mode 100644
index 0000000..2071b23
--- /dev/null
+++ b/LICENSES/MIT.txt
@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Makefile b/Makefile
index 8ee6837..0f8fc19 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: Yoran Heling <projects@yorhel.nl>
+# SPDX-License-Identifier: MIT
+
CC ?= cc
CFLAGS ?= -Wall -O2 -g
PREFIX ?= /usr/local
diff --git a/README b/README
deleted file mode 100644
index 6ecb677..0000000
--- a/README
+++ /dev/null
@@ -1,22 +0,0 @@
-nginx-confgen
-=============
-
-DESCRIPTION
-
- nginx-confgen is a preprocessor and macro system for nginx(-like)
- configuration files.
-
-BUILD
-
- Just type 'make'.
-
- That will also create the man page, which will require pod2man. If you just
- want build the binary, type 'make bin'.
-
-INSTALL
-
- make install PREFIX=/usr
-
-USAGE
-
- See the man page.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..1952fa0
--- /dev/null
+++ b/README.md
@@ -0,0 +1,26 @@
+<!--
+SPDX-FileCopyrightText: Yoran Heling <projects@yorhel.nl>
+SPDX-License-Identifier: MIT
+-->
+
+# nginx-confgen
+
+nginx-confgen is a preprocessor and macro system for nginx(-like)
+configuration files.
+
+# Build
+
+Just type `make`.
+
+That will also create the man page, which will require pod2man. If you just
+want build the binary, type `make bin`.
+
+# Install
+
+```
+make install PREFIX=/usr
+```
+
+# Usage
+
+See the man page or the [website](https://dev.yorhel.nl/nginx-confgen).
diff --git a/nginx-confgen.c b/nginx-confgen.c
index 063a6bc..524ce2c 100644
--- a/nginx-confgen.c
+++ b/nginx-confgen.c
@@ -1,24 +1,5 @@
-/* Copyright (c) 2020-2022 Yoran Heling
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
+/* SPDX-FileCopyrightText: Yoran Heling <projects@yorhel.nl>
+ * SPDX-License-Identifier: MIT */
#define _GNU_SOURCE
#include <string.h>