tiiuae · tervis-unikie · Feb 28, 2024 · Feb 28, 2024
diff --git a/.envrc b/.envrc
@@ -1,10 +1,9 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 
 # try to use flake initially, fallback to non-flake use otherwise
 if nix flake show &> /dev/null; then
   use flake
 else
   use nix
-fi
+fi
diff --git a/.github/workflows/check-commit-message.yaml b/.github/workflows/check-commit-message.yaml
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022-2024 Technology Innovation Institute (TII)
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 
 name: Check Commit Message

diff --git a/.github/workflows/test-ghaf-infra.yml b/.github/workflows/test-ghaf-infra.yml
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 
 name: Test ghaf-infra

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 
 result

diff --git a/.sops.yaml b/.sops.yaml
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 
 keys:

diff --git a/README.md b/README.md
@@ -1,6 +1,5 @@
 <!--
-SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-
+SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 SPDX-License-Identifier: CC-BY-SA-4.0
 -->
 

diff --git a/default.nix b/default.nix
@@ -1,6 +1,5 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-FileCopyrightText: 2020-2023 Eelco Dolstra and the flake-compat contributors
-#
 # SPDX-License-Identifier: MIT
 # This file originates from:
 # https://github.com/nix-community/flake-compat

diff --git a/docs/adapting-to-new-environments.md b/docs/adapting-to-new-environments.md
@@ -1,6 +1,5 @@
 <!--
-SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-
+SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 SPDX-License-Identifier: CC-BY-SA-4.0
 -->
 

diff --git a/docs/monitoring-server.md b/docs/monitoring-server.md
@@ -1,6 +1,5 @@
 <!--
-SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-
+SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 SPDX-License-Identifier: CC-BY-SA-4.0
 -->
 

diff --git a/docs/nixos-anywhere.md b/docs/nixos-anywhere.md
@@ -1,6 +1,5 @@
 <!--
-SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-
+SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 SPDX-License-Identifier: CC-BY-SA-4.0
 -->
 

diff --git a/flake.nix b/flake.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 {
   description = "NixOS configurations for Ghaf";

diff --git a/githooks/check-commit.sh b/githooks/check-commit.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-FileCopyrightText: 2021-2024 Technology Innovation Institute (TII)
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 
 function Error {

diff --git a/githooks/check-commits.sh b/githooks/check-commits.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-FileCopyrightText: 2022-2024 Technology Innovation Institute (TII)
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 
 # Get actual directory of this bash script

diff --git a/githooks/install-git-hooks.sh b/githooks/install-git-hooks.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# SPDX-FileCopyrightText: 2022-2024 Technology Innovation Institute (TII)
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 
 set -e

diff --git a/hosts/azure-common.nix b/hosts/azure-common.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 #
 # Profile to import for Azure VMs. Imports azure-common.nix from nixpkgs,

diff --git a/hosts/azure-scratch-store-common.nix b/hosts/azure-scratch-store-common.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 #
 # This configuration is currently not used, but kept here for reference.

diff --git a/hosts/azure/binary-cache/configuration.nix b/hosts/azure/binary-cache/configuration.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 {
   self,

diff --git a/hosts/azure/builder/configuration.nix b/hosts/azure/builder/configuration.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 {
   self,

diff --git a/hosts/azure/jenkins-controller/configuration.nix b/hosts/azure/jenkins-controller/configuration.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 {
   pkgs,

diff --git a/hosts/binarycache/configuration.nix b/hosts/binarycache/configuration.nix
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023-2024 Technology Innovation Institute (TII)
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 #
 {

diff --git a/hosts/binarycache/disk-config.nix b/hosts/binarycache/disk-config.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 # BIOS compatible gpt partition
 {

diff --git a/hosts/common.nix b/hosts/common.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 {
   inputs,

diff --git a/hosts/default.nix b/hosts/default.nix
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023-2024 Technology Innovation Institute (TII)
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 #
 {

diff --git a/hosts/ficolo-common.nix b/hosts/ficolo-common.nix
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2024 Technology Innovation Institute (TII)
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 #
 {

diff --git a/hosts/ficolobuild/build3.nix b/hosts/ficolobuild/build3.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2024 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 {
   self,

diff --git a/hosts/ficolobuild/build4.nix b/hosts/ficolobuild/build4.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2024 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 {
   self,

diff --git a/hosts/ficolobuild/builder.nix b/hosts/ficolobuild/builder.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023-2024 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 {
   self,

diff --git a/hosts/ficolobuild/developers.nix b/hosts/ficolobuild/developers.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2024 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 {lib, ...}: let
   groupName = "developers";

diff --git a/hosts/ficolobuild/disk-config.nix b/hosts/ficolobuild/disk-config.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 # BIOS compatible gpt partition
 {

diff --git a/hosts/generic-disk-config.nix b/hosts/generic-disk-config.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 {lib, ...}: {
   disko.devices = {

diff --git a/hosts/monitoring/configuration.nix b/hosts/monitoring/configuration.nix
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023-2024 Technology Innovation Institute (TII)
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 #
 {

diff --git a/hosts/monitoring/disk-config.nix b/hosts/monitoring/disk-config.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 # BIOS compatible gpt partition
 {

diff --git a/hosts/prbuilder/configuration.nix b/hosts/prbuilder/configuration.nix
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2023-2024 Technology Innovation Institute (TII)
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 #
 {

diff --git a/hosts/prbuilder/disk-config.nix b/hosts/prbuilder/disk-config.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 # BIOS compatible gpt partition
 {

diff --git a/hosts/qemu-common.nix b/hosts/qemu-common.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 {
   services.qemuGuest.enable = true;

diff --git a/hosts/templates/configuration.nix b/hosts/templates/configuration.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 {
   self,

diff --git a/hosts/templates/default.nix b/hosts/templates/default.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 {
   self,

diff --git a/nix/checks.nix b/nix/checks.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 _: {
   perSystem = {pkgs, ...}: {

diff --git a/nix/default.nix b/nix/default.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 {
   imports = [

diff --git a/nix/devshell.nix b/nix/devshell.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 {
   perSystem = {pkgs, ...}: {

diff --git a/nix/nixpkgs.nix b/nix/nixpkgs.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 {
   lib,

diff --git a/nix/treefmt.nix b/nix/treefmt.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 {inputs, ...}: {
   imports = with inputs; [

diff --git a/pkgs/sshified/default.nix b/pkgs/sshified/default.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 {
   buildGoModule,

diff --git a/scripts/add-remote-user.sh b/scripts/add-remote-user.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 
 ################################################################################

diff --git a/services/binary-cache/default.nix b/services/binary-cache/default.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 {
   config,

diff --git a/services/default.nix b/services/default.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 {
   flake.nixosModules = {

diff --git a/services/nginx/default.nix b/services/nginx/default.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 {config, ...}: {
   networking.firewall.allowedTCPPorts = [443 80];

diff --git a/services/node-exporter/default.nix b/services/node-exporter/default.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 {config, ...}: {
   networking.firewall = {

diff --git a/services/openssh/default.nix b/services/openssh/default.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 {
   pkgs,

diff --git a/services/remote-build/default.nix b/services/remote-build/default.nix
@@ -1,5 +1,4 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-#
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 _: {
   # Adds a "remote-build" ssh user, which can trigger nix builds.

diff --git a/shell.nix b/shell.nix
@@ -1,6 +1,5 @@
-# SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-FileCopyrightText: 2020-2023 Eelco Dolstra and the flake-compat contributors
-#
 # SPDX-License-Identifier: MIT
 # This file originates from:
 # https://github.com/nix-community/flake-compat

diff --git a/tasks.py b/tasks.py
@@ -1,8 +1,7 @@
 #!/usr/bin/env python3
 
-# SPDX-FileCopyrightText: 2023-2024 Technology Innovation Institute (TII)
+# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 # SPDX-FileCopyrightText: 2023 Nix community projects
-#
 # SPDX-License-Identifier: MIT
 
 # This file originates from:

diff --git a/terraform/README-azure.md b/terraform/README-azure.md
@@ -1,6 +1,5 @@
 <!--
-SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-
+SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 SPDX-License-Identifier: CC-BY-SA-4.0
 -->
 

diff --git a/terraform/README.md b/terraform/README.md
@@ -1,6 +1,5 @@
 <!--
-SPDX-FileCopyrightText: 2023 Technology Innovation Institute (TII)
-
+SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
 SPDX-License-Identifier: CC-BY-SA-4.0
 -->
 
@@ -208,4 +207,4 @@ $ terraform apply
 │  207: data "azurerm_managed_disk" "binary_cache_caddy_state" {
 ```
 Above error (or similar) is likely caused by missing initialization for some `persistent` resources.
-Fix the persistent initialization by running `terraform-init.sh` then run `terraform apply` again.
+Fix the persistent initialization by running `terraform-init.sh` then run `terraform apply` again.