sercanto/infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request from nix-community/refactor

Browse source 
refactor roles
This commit is contained in:
Jörg Thalheim 2022-12-03 08:32:19 +01:00 • committed by GitHub
commit fb523b4d27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 16 additions and 14 deletions

2
README.md
View file

@ -139,7 +139,7 @@ $ inv setup-secret --hosts buildXX
```console ```console
$ nixos-generate-config --root /tmp $ 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 $ scp buildXX.nix-community.org:/tmp/etc/nixos/hardware-configuration.nix buildXX/hardware-configuration.nix
``` ```

5
build01/configuration.nix
View file

@ -11,10 +11,9 @@
# nixos-enter # nixos-enter
{ {
imports = [ imports = [
../roles/dev-packages.nix
../roles/common.nix ../roles/common.nix
../roles/hardware/hetzner-amd.nix ../roles/hetzner/amd.nix
../roles/hetzner-network.nix ../roles/hetzner/network.nix
../roles/raid.nix ../roles/raid.nix
../roles/builder ../roles/builder
../roles/remote-builder/aarch64-nixos-community.nix ../roles/remote-builder/aarch64-nixos-community.nix

4
build02/configuration.nix
View file

@ -3,8 +3,8 @@
{ {
imports = [ imports = [
../roles/common.nix ../roles/common.nix
../roles/hardware/hetzner-amd.nix ../roles/hetzner/amd.nix
../roles/hetzner-network.nix ../roles/hetzner/network.nix
../roles/nginx.nix ../roles/nginx.nix
../roles/raid.nix ../roles/raid.nix
../roles/remote-builder/aarch64-build04.nix ../roles/remote-builder/aarch64-build04.nix

6
build03/configuration.nix
View file

@ -11,16 +11,16 @@
# $ nixos-enter # $ nixos-enter
imports = [ imports = [
../roles/common.nix ../roles/common.nix
../roles/hardware/hetzner-amd.nix ../roles/hetzner/amd.nix
../roles/hetzner/network.nix
../roles/hercules-ci ../roles/hercules-ci
../roles/hetzner-network.nix
../roles/nginx.nix ../roles/nginx.nix
../roles/raid.nix ../roles/raid.nix
../roles/remote-builder/aarch64-build04.nix ../roles/remote-builder/aarch64-build04.nix
../services/hound ../services/hound
../services/hydra ../services/hydra
../services/matterbridge.nix ../services/matterbridge
]; ];
# /boot is a mirror raid # /boot is a mirror raid

2
build04/configuration.nix
View file

@ -4,7 +4,7 @@
./hardware-configuration.nix ./hardware-configuration.nix
../roles/common.nix ../roles/common.nix
../roles/hercules-ci ../roles/hercules-ci
../roles/builder.nix ../roles/remote-builder/user.nix
]; ];
nixpkgs.system = "aarch64-linux"; nixpkgs.system = "aarch64-linux";

5
roles/builder/default.nix
View file

@ -1,3 +1,6 @@
{ ... }: { { ... }: {
imports = [ ./users.nix ]; imports = [
./packages.nix
./users.nix
];
} }

0
roles/dev-packages.nix → roles/builder/packages.nix
View file

6
roles/common.nix
View file

@ -3,14 +3,14 @@
{ {
imports = [ imports = [
./auto-upgrade.nix
./nix-daemon.nix ./nix-daemon.nix
./security.nix ./security.nix
./sops-nix.nix
./sshd.nix ./sshd.nix
./telegraf ./telegraf.nix
./users.nix ./users.nix
./zfs.nix ./zfs.nix
./sops-nix.nix
./auto-upgrade.nix
]; ];
environment.systemPackages = [ environment.systemPackages = [

0
roles/hardware/hetzner-amd.nix → roles/hetzner/amd.nix
View file

0
roles/hetzner-network.nix → roles/hetzner/network.nix
View file

0
roles/builder.nix → roles/remote-builder/user.nix
View file

0
roles/telegraf/default.nix → roles/telegraf.nix
View file

0
services/matterbridge.nix → services/matterbridge/default.nix
View file