hans/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity

Use secrets module to clean up configurations

Browse source
This commit is contained in:
Nicolas Jeannerod 2024-12-12 18:16:57 +01:00
parent f753422295
commit 9407af8ac8
Signed by untrusted user: Niols
GPG key ID: 35DB9EC8886E1CB8
4 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
infra/flake-part.nix
View file

@ -19,7 +19,8 @@
nixos.module = { nixos.module = {
imports = [ imports = [
./vm02116 ./vm02116
inputs.agenix.nixosModules.default self.nixosModules.ageSecrets
{ x_fediversity.hostPublicKey = self.keys.systems.vm02116; }
]; ];
}; };
}; };
@ -36,7 +37,8 @@
nixos.module = { nixos.module = {
imports = [ imports = [
./vm02179 ./vm02179
inputs.agenix.nixosModules.default self.nixosModules.ageSecrets
{ x_fediversity.hostPublicKey = self.keys.systems.vm02179; }
]; ];
}; };
}; };
@ -53,7 +55,8 @@
nixos.module = { nixos.module = {
imports = [ imports = [
./vm02186 ./vm02186
inputs.agenix.nixosModules.default self.nixosModules.ageSecrets
{ x_fediversity.hostPublicKey = self.keys.systems.vm02186; }
]; ];
}; };
}; };
@ -76,7 +79,11 @@
}; };
nixpkgs = inputs.nixpkgs; nixpkgs = inputs.nixpkgs;
nixos.module = { nixos.module = {
imports = [ ./vm02187 ]; imports = [
./vm02187
self.nixosModules.ageSecrets
{ x_fediversity.hostPublicKey = self.keys.systems.vm02187; }
];
}; };
}; };
}; };

2
infra/vm02116/forgejo.nix
View file

@ -37,12 +37,10 @@ in
}; };
age.secrets.forgejo-database-password = { age.secrets.forgejo-database-password = {
file = ../../secrets/forgejo-database-password.age;
owner = "forgejo"; owner = "forgejo";
group = "forgejo"; group = "forgejo";
mode = "440"; mode = "440";
}; };
age.secrets.forgejo-email-password.file = ../../secrets/forgejo-email-password.age;
users.groups.keys.members = [ "forgejo" ]; users.groups.keys.members = [ "forgejo" ];

2
infra/vm02179/gitea-runner.nix
View file

@ -34,8 +34,6 @@
}; };
}; };
age.secrets.forgejo-runner-token.file = ../../secrets/forgejo-runner-token.age;
## The Nix configuration of the system influences the Nix configuration ## The Nix configuration of the system influences the Nix configuration
## in the workflow, and our workflows are often flake-based. ## in the workflow, and our workflows are often flake-based.
nix.extraOptions = '' nix.extraOptions = ''

2
infra/vm02186/gitea-runner.nix
View file

@ -38,8 +38,6 @@
}; };
}; };
age.secrets.forgejo-runner-token.file = ../../secrets/forgejo-runner-token.age;
## For the Docker mode of the runner. ## For the Docker mode of the runner.
virtualisation.docker.enable = true; virtualisation.docker.enable = true;