From becbce968ad858f89575bed945283884b9631e50 Mon Sep 17 00:00:00 2001 From: anastasianayden Date: Wed, 13 Mar 2024 11:08:49 +0100 Subject: [PATCH] fix: add and update license information docs: typos fixed --- .env.example | 2 +- .gitignore | 2 +- README.md | 4 ++-- ckan/Dockerfile | 2 +- ckan/Dockerfile.dev | 2 +- ckan/docker-entrypoint.d/README.md | 2 +- ckan/patches/00_test_test.patch | 2 +- ckan/prepopulate_db/common_vocabulary_tags.csv.license | 3 +++ ckan/prepopulate_db/upload_vocabulary.sh | 4 ++++ ckan/setup/prerun.py | 2 +- ckan/setup/start_ckan.sh.override | 2 +- ckan/setup/start_ckan_development.sh.override | 2 +- docker-compose.yml | 2 +- postgresql/Dockerfile | 2 +- postgresql/docker-entrypoint-initdb.d/.gitattributes | 2 +- postgresql/docker-entrypoint-initdb.d/1_create_ckandb.sh | 2 +- .../docker-entrypoint-initdb.d/3_setup_test_databases.sh | 2 +- 17 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 ckan/prepopulate_db/common_vocabulary_tags.csv.license diff --git a/.env.example b/.env.example index 1202bb4a..c86c5f3e 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2006-2023 Open Knowledge Foundation and contributors +# SPDX-FileCopyrightText: 2006-2024 Open Knowledge Foundation and contributors # SPDX-FileContributor: PNED G.I.E. # # SPDX-License-Identifier: AGPL-3.0-only diff --git a/.gitignore b/.gitignore index 7cbe938c..d6d2c865 100755 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2006-2023 Open Knowledge Foundation and contributors +# SPDX-FileCopyrightText: 2006-2024 Open Knowledge Foundation and contributors # SPDX-FileContributor: PNED G.I.E. # # SPDX-License-Identifier: AGPL-3.0-only diff --git a/README.md b/README.md index 644f8891..7cc0c57d 100644 --- a/README.md +++ b/README.md @@ -77,9 +77,9 @@ more information. Copying and License ------------------- -This work is licensed under multiple licences. Here is a brief summary as of January 2024: +This work is licensed under multiple licenses. Here is a brief summary as of January 2024: -- All original source code is licensed under [AGPL-3.0-only](./LICENSES/AGPL-3.0-only.txt), copyright (c) 2006-2023 Open Knowledge Foundation and contributors. +- All original source code is licensed under [AGPL-3.0-only](./LICENSES/AGPL-3.0-only.txt), copyright (c) 2006-2024 Open Knowledge Foundation and contributors. - All documentation is licensed under [CC-BY-4.0](./LICENSES/CC-BY-4.0.txt). - github actions workflows are licensed under [Apache-2.0](./LICENSES/Apache-2.txt). - For more accurate information, check the individual files. diff --git a/ckan/Dockerfile b/ckan/Dockerfile index e6b33231..00e68e3c 100644 --- a/ckan/Dockerfile +++ b/ckan/Dockerfile @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2006-2023 Open Knowledge Foundation and contributors +# SPDX-FileCopyrightText: 2006-2024 Open Knowledge Foundation and contributors # SPDX-FileContributor: PNED G.I.E. # SPDX-FileContributor: Stichting Health-RI # diff --git a/ckan/Dockerfile.dev b/ckan/Dockerfile.dev index 295d82cf..251afca3 100644 --- a/ckan/Dockerfile.dev +++ b/ckan/Dockerfile.dev @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2006-2023 Open Knowledge Foundation and contributors +# SPDX-FileCopyrightText: 2006-2024 Open Knowledge Foundation and contributors # SPDX-FileContributor: PNED G.I.E. # # SPDX-License-Identifier: AGPL-3.0-only diff --git a/ckan/docker-entrypoint.d/README.md b/ckan/docker-entrypoint.d/README.md index 5d63f405..1ea81684 100644 --- a/ckan/docker-entrypoint.d/README.md +++ b/ckan/docker-entrypoint.d/README.md @@ -1,5 +1,5 @@ diff --git a/ckan/patches/00_test_test.patch b/ckan/patches/00_test_test.patch index 3160e416..7d996673 100644 --- a/ckan/patches/00_test_test.patch +++ b/ckan/patches/00_test_test.patch @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2006-2023 Open Knowledge Foundation and contributors +# SPDX-FileCopyrightText: 2006-2024 Open Knowledge Foundation and contributors # # SPDX-License-Identifier: AGPL-3.0-only diff --git a/ckan/prepopulate_db/common_vocabulary_tags.csv.license b/ckan/prepopulate_db/common_vocabulary_tags.csv.license new file mode 100644 index 00000000..d6964a80 --- /dev/null +++ b/ckan/prepopulate_db/common_vocabulary_tags.csv.license @@ -0,0 +1,3 @@ +# SPDX-FileCopyrightText: 2006-2024 Open Knowledge Foundation and contributors +# SPDX-FileContributor: Stichting Health-RI +# SPDX-License-Identifier: AGPL-3.0-only \ No newline at end of file diff --git a/ckan/prepopulate_db/upload_vocabulary.sh b/ckan/prepopulate_db/upload_vocabulary.sh index 86464c40..d9ad5616 100644 --- a/ckan/prepopulate_db/upload_vocabulary.sh +++ b/ckan/prepopulate_db/upload_vocabulary.sh @@ -1,5 +1,9 @@ #!/bin/bash +# SPDX-FileCopyrightText: 2006-2024 Open Knowledge Foundation and contributors +# SPDX-FileContributor: Stichting Health-RI +# SPDX-License-Identifier: AGPL-3.0-only + set -e psql postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST:5432/$CKAN_DB -c "\copy public.term_translation FROM '/prepopulate_db/common_vocabulary_tags.csv' WITH (DELIMITER ',', FORMAT CSV, HEADER TRUE);" diff --git a/ckan/setup/prerun.py b/ckan/setup/prerun.py index a37888fb..23052ab0 100644 --- a/ckan/setup/prerun.py +++ b/ckan/setup/prerun.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2006-2023 Open Knowledge Foundation and contributors +# SPDX-FileCopyrightText: 2006-2024 Open Knowledge Foundation and contributors # SPDX-FileContributor: PNED G.I.E. # # SPDX-License-Identifier: AGPL-3.0-only diff --git a/ckan/setup/start_ckan.sh.override b/ckan/setup/start_ckan.sh.override index 247dbcf1..303e1eb7 100755 --- a/ckan/setup/start_ckan.sh.override +++ b/ckan/setup/start_ckan.sh.override @@ -1,6 +1,6 @@ #!/bin/sh -# SPDX-FileCopyrightText: 2006-2023 Open Knowledge Foundation and contributors +# SPDX-FileCopyrightText: 2006-2024 Open Knowledge Foundation and contributors # # SPDX-License-Identifier: AGPL-3.0-only diff --git a/ckan/setup/start_ckan_development.sh.override b/ckan/setup/start_ckan_development.sh.override index 6daadf7d..03aa891c 100755 --- a/ckan/setup/start_ckan_development.sh.override +++ b/ckan/setup/start_ckan_development.sh.override @@ -1,6 +1,6 @@ #!/bin/sh -# SPDX-FileCopyrightText: 2006-2023 Open Knowledge Foundation and contributors +# SPDX-FileCopyrightText: 2006-2024 Open Knowledge Foundation and contributors # # SPDX-License-Identifier: AGPL-3.0-only diff --git a/docker-compose.yml b/docker-compose.yml index fd975a82..3ae1a428 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2006-2023 Open Knowledge Foundation and contributors +# SPDX-FileCopyrightText: 2006-2024 Open Knowledge Foundation and contributors # SPDX-FileContributor: PNED G.I.E. # # SPDX-License-Identifier: AGPL-3.0-only diff --git a/postgresql/Dockerfile b/postgresql/Dockerfile index de4e8275..4073007a 100755 --- a/postgresql/Dockerfile +++ b/postgresql/Dockerfile @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2006-2023 Open Knowledge Foundation and contributors +# SPDX-FileCopyrightText: 2006-2024 Open Knowledge Foundation and contributors # # SPDX-License-Identifier: AGPL-3.0-only diff --git a/postgresql/docker-entrypoint-initdb.d/.gitattributes b/postgresql/docker-entrypoint-initdb.d/.gitattributes index 812e0ad2..38dac1db 100644 --- a/postgresql/docker-entrypoint-initdb.d/.gitattributes +++ b/postgresql/docker-entrypoint-initdb.d/.gitattributes @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2006-2023 Open Knowledge Foundation and contributors +# SPDX-FileCopyrightText: 2006-2024 Open Knowledge Foundation and contributors # # SPDX-License-Identifier: AGPL-3.0-only diff --git a/postgresql/docker-entrypoint-initdb.d/1_create_ckandb.sh b/postgresql/docker-entrypoint-initdb.d/1_create_ckandb.sh index dce5d5a0..c21d4510 100755 --- a/postgresql/docker-entrypoint-initdb.d/1_create_ckandb.sh +++ b/postgresql/docker-entrypoint-initdb.d/1_create_ckandb.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2006-2023 Open Knowledge Foundation and contributors +# SPDX-FileCopyrightText: 2006-2024 Open Knowledge Foundation and contributors # SPDX-FileContributor: PNED G.I.E. # # SPDX-License-Identifier: AGPL-3.0-only diff --git a/postgresql/docker-entrypoint-initdb.d/3_setup_test_databases.sh b/postgresql/docker-entrypoint-initdb.d/3_setup_test_databases.sh index b0f34ef8..3a6eae5a 100755 --- a/postgresql/docker-entrypoint-initdb.d/3_setup_test_databases.sh +++ b/postgresql/docker-entrypoint-initdb.d/3_setup_test_databases.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2006-2023 Open Knowledge Foundation and contributors +# SPDX-FileCopyrightText: 2006-2024 Open Knowledge Foundation and contributors # SPDX-FileContributor: PNED G.I.E. # # SPDX-License-Identifier: AGPL-3.0-only