From f55281340895da2ada24f68f8a0d2a6b28d9eae0 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sat, 3 Dec 2022 10:11:40 +1000
Subject: [PATCH] roles/hardware/hetzner-amd.nix, roles/hetzner-network.nix ->
roles/hetzner
---
README.md | 2 +-
build01/configuration.nix | 4 ++--
build02/configuration.nix | 4 ++--
build03/configuration.nix | 4 ++--
roles/{hardware/hetzner-amd.nix => hetzner/amd.nix} | 0
roles/{hetzner-network.nix => hetzner/network.nix} | 0
6 files changed, 7 insertions(+), 7 deletions(-)
rename roles/{hardware/hetzner-amd.nix => hetzner/amd.nix} (100%)
rename roles/{hetzner-network.nix => hetzner/network.nix} (100%)
diff --git a/README.md b/README.md
index 5dc9653..a324aa2 100644
--- a/README.md
+++ b/README.md
@@ -152,7 +152,7 @@ $ inv setup-secret --hosts buildXX
```console
$ nixos-generate-config --root /tmp
-# optional, in most cases one can import roles/hardware/hetzner-amd.nix
+# optional, in most cases one can import roles/hetzner/amd.nix
$ scp buildXX.nix-community.org:/tmp/etc/nixos/hardware-configuration.nix buildXX/hardware-configuration.nix
```
diff --git a/build01/configuration.nix b/build01/configuration.nix
index b243e11..9cfcddf 100644
--- a/build01/configuration.nix
+++ b/build01/configuration.nix
@@ -12,8 +12,8 @@
{
imports = [
../roles/common.nix
- ../roles/hardware/hetzner-amd.nix
- ../roles/hetzner-network.nix
+ ../roles/hetzner/amd.nix
+ ../roles/hetzner/network.nix
../roles/raid.nix
../roles/builder
../roles/remote-builder/aarch64-nixos-community.nix
diff --git a/build02/configuration.nix b/build02/configuration.nix
index 862b684..aa9f99e 100644
--- a/build02/configuration.nix
+++ b/build02/configuration.nix
@@ -3,8 +3,8 @@
{
imports = [
../roles/common.nix
- ../roles/hardware/hetzner-amd.nix
- ../roles/hetzner-network.nix
+ ../roles/hetzner/amd.nix
+ ../roles/hetzner/network.nix
../roles/nginx.nix
../roles/raid.nix
../roles/remote-builder/aarch64-build04.nix
diff --git a/build03/configuration.nix b/build03/configuration.nix
index 91f8cd3..0bf5b4b 100644
--- a/build03/configuration.nix
+++ b/build03/configuration.nix
@@ -11,9 +11,9 @@
# $ nixos-enter
imports = [
../roles/common.nix
- ../roles/hardware/hetzner-amd.nix
+ ../roles/hetzner/amd.nix
+ ../roles/hetzner/network.nix
../roles/hercules-ci
- ../roles/hetzner-network.nix
../roles/nginx.nix
../roles/raid.nix
../roles/remote-builder/aarch64-build04.nix
diff --git a/roles/hardware/hetzner-amd.nix b/roles/hetzner/amd.nix
similarity index 100%
rename from roles/hardware/hetzner-amd.nix
rename to roles/hetzner/amd.nix
diff --git a/roles/hetzner-network.nix b/roles/hetzner/network.nix
similarity index 100%
rename from roles/hetzner-network.nix
rename to roles/hetzner/network.nix