remove agenix and migrate secrets to clan vars
squash this
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
{
|
||||
services.radicle = {
|
||||
enable = true;
|
||||
privateKeyFile = config.age.secrets.radicle-private-key.path;
|
||||
privateKeyFile = config.clan.core.vars.generators.radicle.files.radicle-private-key.path;
|
||||
publicKey = keys.services.radicle;
|
||||
node = {
|
||||
openFirewall = true;
|
||||
@@ -17,5 +17,11 @@
|
||||
};
|
||||
};
|
||||
|
||||
age.secrets.radicle-private-key.file = ../../secrets/radicle-private-key.age;
|
||||
clan.core.vars.generators.radicle = {
|
||||
prompts.radicle-private-key = {
|
||||
description = "radicle node private key";
|
||||
type = "hidden";
|
||||
persist = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,21 +1,25 @@
|
||||
{ config, ... }:
|
||||
{
|
||||
imports = [
|
||||
../../modules/gandi.nix
|
||||
];
|
||||
|
||||
security.acme = {
|
||||
acceptTerms = true;
|
||||
defaults.email = "admin@rpqt.fr";
|
||||
};
|
||||
|
||||
age.secrets.gandi.file = ../../secrets/gandi.age;
|
||||
|
||||
security.acme = {
|
||||
certs."home.rpqt.fr" = {
|
||||
group = config.services.nginx.group;
|
||||
|
||||
domain = "home.rpqt.fr";
|
||||
extraDomainNames = [ "*.home.rpqt.fr" ];
|
||||
dnsProvider = "gandiv5";
|
||||
dnsPropagationCheck = true;
|
||||
environmentFile = config.age.secrets.gandi.path;
|
||||
environmentFile = config.clan.core.vars.generators.gandi.files.gandi-env.path;
|
||||
email = "admin@rpqt.fr";
|
||||
};
|
||||
};
|
||||
|
||||
clan.core.vars.generators.gandi.files.gandi-env.owner = "acme";
|
||||
}
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
self.inputs.agenix.nixosModules.default
|
||||
./acme.nix
|
||||
./boot.nix
|
||||
./builder.nix
|
||||
|
||||
@@ -4,23 +4,26 @@ let
|
||||
subdomain = "rss.${domain}";
|
||||
in
|
||||
{
|
||||
age.secrets.freshrss = {
|
||||
file = ../../secrets/freshrss.age;
|
||||
mode = "700";
|
||||
owner = config.services.freshrss.user;
|
||||
};
|
||||
|
||||
services.freshrss = {
|
||||
enable = true;
|
||||
baseUrl = "https://${subdomain}";
|
||||
virtualHost = "${subdomain}";
|
||||
|
||||
defaultUser = "rpqt";
|
||||
passwordFile = config.age.secrets.freshrss.path;
|
||||
passwordFile = config.clan.core.vars.generators.freshrss.files.freshrss-password.path;
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts.${config.services.freshrss.virtualHost} = {
|
||||
forceSSL = true;
|
||||
useACMEHost = "${domain}";
|
||||
};
|
||||
|
||||
clan.core.vars.generators.freshrss = {
|
||||
prompts.freshrss-password = {
|
||||
description = "freshrss default user password";
|
||||
type = "hidden";
|
||||
persist = true;
|
||||
};
|
||||
files.freshrss-password.owner = config.services.freshrss.user;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -4,8 +4,6 @@
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
# inputs.disko.nixosModules.disko
|
||||
self.inputs.agenix.nixosModules.default
|
||||
./boot.nix
|
||||
./chat.nix
|
||||
./firefox.nix
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
let
|
||||
keys = import ../../../parts/keys.nix;
|
||||
in
|
||||
{
|
||||
"syncthing-key.pem.age".publicKeys = [
|
||||
keys.hosts.haze
|
||||
keys.rpqt.haze
|
||||
];
|
||||
"syncthing-cert.pem.age".publicKeys = [
|
||||
keys.hosts.haze
|
||||
keys.rpqt.haze
|
||||
];
|
||||
}
|
||||
Binary file not shown.
@@ -1,8 +0,0 @@
|
||||
age-encryption.org/v1
|
||||
-> ssh-ed25519 P3fsag cm2nekzBIMCAb/yXzY4L6jIH/Sa+rSMznT88WJNkP30
|
||||
DMnRf0An69vywpHLD3RGHwE0dkaa6JIEahhQo14EEDc
|
||||
--- f/kI+HBhWTQlXoWvCJaLJM70EsOkH4G8/5g9Eeu8uNc
|
||||
|
||||
<EFBFBD>T!<21><><12>\Β<>6<16>
|
||||
<EFBFBD>T<><54>rϵKr<4B>9<EFBFBD><39>w<EFBFBD>̞<EFBFBD>8<04><><EFBFBD><EFBFBD>E<EFBFBD><45><EFBFBD><EFBFBD>,<2C>R.<2E><><EFBFBD><EFBFBD><EFBFBD>i<> <20><><EFBFBD><EFBFBD>_'2<>;i<>ń<EFBFBD>8d<04><><EFBFBD><EFBFBD><EFBFBD>&Dݫq<><71><EFBFBD>xd
|
||||
<EFBFBD>3<EFBFBD>e<EFBFBD>xn<EFBFBD>g~<7E>/)݇a<DD87><13>W<><57><EFBFBD>G~<1F><><EFBFBD>BNV<4E><56>i<EFBFBD>a<05>{<7B><17><>u<EFBFBD>ە<1B>R=<3D><>M<EFBFBD>O)$HS<48><53>f<EFBFBD>f<<3C><>c<><63>?<3F><01>~*<2A>T<EFBFBD><07><>)Wtʁ<18><><EFBFBD>&<15><>8i<38><69><EFBFBD>z<EFBFBD><7A>:5<><35>[sc"<22><><1A><>& U<><55><EFBFBD>9<EFBFBD><39>'<27><>_<5F><7F>{xkE<6B><45>ؼY<0E>@<40><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>f<EFBFBD>U<EFBFBD>+<2B><>B<EFBFBD>u<EFBFBD>=<3D><>Y4<0F>e3<65>U<01><>QLSl5 U<>qښ<1B>!<10>h<EFBFBD><68>W<EFBFBD><57>@}<7D>OW<4F><57><EFBFBD>
|
||||
@@ -7,24 +7,21 @@ let
|
||||
home = config.users.users.${user}.home;
|
||||
in
|
||||
{
|
||||
# age.secrets.syncthing-key.file = ./secrets/syncthing-key.pem.age;
|
||||
# age.secrets.syncthing-cert.file = ./secrets/syncthing-cert.pem.age;
|
||||
|
||||
services.syncthing = {
|
||||
enable = false;
|
||||
enable = true;
|
||||
user = user;
|
||||
group = "users";
|
||||
dataDir = home;
|
||||
configDir = "${home}/.config/syncthing";
|
||||
key = config.age.secrets.syncthing-key.path;
|
||||
cert = config.age.secrets.syncthing-cert.path;
|
||||
key = config.clan.core.vars.generators.syncthing.files."key".path;
|
||||
cert = config.clan.core.vars.generators.syncthing.files."cert".path;
|
||||
openDefaultPorts = true;
|
||||
overrideDevices = true;
|
||||
overrideFolders = true;
|
||||
settings = {
|
||||
devices = {
|
||||
"genepi" = {
|
||||
id = "EA7DC7O-IHB47EQ-AWT2QBJ-AWPDF5S-W4EM66A-KQPCTHI-UX53WKM-QTSAHQ4";
|
||||
id = "TNP3M2Z-2AJ3CJE-4LLYHME-3KWCLN4-XQWBIDJ-PTDRANE-RRBYQWQ-KXJFTQU";
|
||||
};
|
||||
"pixel-7a" = {
|
||||
id = "IZE7B4Z-LKTJY6Q-77NN4JG-ADYRC77-TYPZTXE-Q35BWV2-AEO7Q3R-ZE63IAU";
|
||||
@@ -60,4 +57,20 @@ in
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
clan.core.vars.generators.syncthing = {
|
||||
prompts.key = {
|
||||
description = "syncthing private key";
|
||||
type = "hidden";
|
||||
persist = true;
|
||||
};
|
||||
files.key.owner = config.services.syncthing.user;
|
||||
|
||||
prompts.cert = {
|
||||
description = "syncthing cert";
|
||||
type = "hidden";
|
||||
persist = true;
|
||||
};
|
||||
files.cert.owner = config.services.syncthing.user;
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user