From f281ef5dbe717db098caee235b067b62c9782aa2 Mon Sep 17 00:00:00 2001 From: Henri Rosten Date: Tue, 28 Nov 2023 09:11:08 +0200 Subject: [PATCH 1/2] Use dep5 to replace .license files Signed-off-by: Henri Rosten --- .reuse/dep5 | 5 +++++ flake.lock.license | 3 --- hosts/binarycache/secrets.yaml.license | 3 --- hosts/build01/secrets.yaml.license | 3 --- hosts/ghafhydra/secrets.yaml.license | 3 --- hosts/monitoring/secrets.yaml.license | 3 --- terraform/secrets.yaml.license | 3 --- 7 files changed, 5 insertions(+), 18 deletions(-) create mode 100644 .reuse/dep5 delete mode 100644 flake.lock.license delete mode 100644 hosts/binarycache/secrets.yaml.license delete mode 100644 hosts/build01/secrets.yaml.license delete mode 100644 hosts/ghafhydra/secrets.yaml.license delete mode 100644 hosts/monitoring/secrets.yaml.license delete mode 100644 terraform/secrets.yaml.license diff --git a/.reuse/dep5 b/.reuse/dep5 new file mode 100644 index 00000000..3dbec680 --- /dev/null +++ b/.reuse/dep5 @@ -0,0 +1,5 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ + +Copyright: 2023 Technology Innovation Institute (TII) +License: Apache-2.0 +Files: *.lock *.png *.svg *.csv *.yaml \ No newline at end of file diff --git a/flake.lock.license b/flake.lock.license deleted file mode 100644 index 856ce263..00000000 --- a/flake.lock.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII) - -SPDX-License-Identifier: Apache-2.0 diff --git a/hosts/binarycache/secrets.yaml.license b/hosts/binarycache/secrets.yaml.license deleted file mode 100644 index 856ce263..00000000 --- a/hosts/binarycache/secrets.yaml.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII) - -SPDX-License-Identifier: Apache-2.0 diff --git a/hosts/build01/secrets.yaml.license b/hosts/build01/secrets.yaml.license deleted file mode 100644 index 856ce263..00000000 --- a/hosts/build01/secrets.yaml.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII) - -SPDX-License-Identifier: Apache-2.0 diff --git a/hosts/ghafhydra/secrets.yaml.license b/hosts/ghafhydra/secrets.yaml.license deleted file mode 100644 index 856ce263..00000000 --- a/hosts/ghafhydra/secrets.yaml.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII) - -SPDX-License-Identifier: Apache-2.0 diff --git a/hosts/monitoring/secrets.yaml.license b/hosts/monitoring/secrets.yaml.license deleted file mode 100644 index 856ce263..00000000 --- a/hosts/monitoring/secrets.yaml.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII) - -SPDX-License-Identifier: Apache-2.0 diff --git a/terraform/secrets.yaml.license b/terraform/secrets.yaml.license deleted file mode 100644 index 856ce263..00000000 --- a/terraform/secrets.yaml.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII) - -SPDX-License-Identifier: Apache-2.0 From f4cc7190e9387deeaacd9163e4e9f261b7f44f51 Mon Sep 17 00:00:00 2001 From: Henri Rosten Date: Tue, 28 Nov 2023 09:55:09 +0200 Subject: [PATCH 2/2] Add ghaf-dev cachix cache Signed-off-by: Henri Rosten --- hosts/common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/common.nix b/hosts/common.nix index 439bf0e4..bddf8689 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -25,10 +25,12 @@ in { experimental-features = "nix-command flakes"; # Subsituters trusted-public-keys = [ + "ghaf-dev.cachix.org-1:S3M8x3no8LFQPBfHw1jl6nmP8A7cVWKntoMKN3IsEQY=" "cache.vedenemo.dev:8NhplARANhClUSWJyLVk4WMyy1Wb4rhmWW2u8AejH9E=" "cache.ssrcdevops.tii.ae:oOrzj9iCppf+me5/3sN/BxEkp5SaFkHfKTPPZ97xXQk=" ]; substituters = [ + "https://ghaf-dev.cachix.org?priority=20" "https://cache.vedenemo.dev" "https://cache.ssrcdevops.tii.ae" ];