mirror of
https://seed.radicle.dev/rad:z254T5p17bdFPmzfDojsdjo4HjpoZ.git
synced 2026-11-21 10:30:44 +08:00
radicle.{xyz → dev,network}
iris.radicle.xyz → iris.radicle.network rosa.radicle.xyz → rosa.radicle.network seed.radicle.xyz → seed.radicle.dev All other virtual hosts on seed.radicle.dev are now also moved under radicle.dev.
This commit is contained in:
@@ -4,13 +4,13 @@ Easing the deployment of Radicle seed nodes with the magic of Nix 🌱 ➕ ❄
|
||||
|
||||
## Deployment
|
||||
|
||||
Then to deploy to the target, for example `seed.radicle.xyz`, use the following
|
||||
Then to deploy to the target, for example `seed.radicle.dev`, use the following
|
||||
command. You might have to adjust the value of `$USER` if the username on your
|
||||
local machine does not match the username of your account on the target machine.
|
||||
Also, note that you may have to get permission to be added as a user first:
|
||||
|
||||
```
|
||||
HOST=seed.radicle.xyz; nixos-rebuild switch --target-host "${USER}@${HOST}" --build-host "${USER}@${HOST}" --use-remote-sudo --flake .
|
||||
HOST=seed.radicle.dev; nixos-rebuild switch --target-host "${USER}@${HOST}" --build-host "${USER}@${HOST}" --use-remote-sudo --flake .
|
||||
```
|
||||
|
||||
### Overlays
|
||||
@@ -32,7 +32,7 @@ Then the following option should be changed in `os/mixin/radicle.nix`:
|
||||
|
||||
## DNS
|
||||
|
||||
The radicle.xyz. zone is configured via [DNSControl].
|
||||
The `radicle.{community,dev,network,xyz}` zones are configured via [DNSControl].
|
||||
Previewing and pushing changes requires a [Cloudflare API Token] in the environment at `CLOUDFLARE_API_TOKEN`.
|
||||
|
||||
In `/dns`:
|
||||
|
||||
+81
-11
@@ -15,9 +15,6 @@ D("radicle.xyz", REG_NONE, DnsProvider(DSP_CLOUDFLARE),
|
||||
CNAME("toot", "vip.masto.host."),
|
||||
|
||||
|
||||
TXT("_atproto", "\"did=did:plc:h3rhdktoagtwfu452cjyw3df\""),
|
||||
|
||||
|
||||
// Migadu
|
||||
MX("@", 10, "aspmx1.migadu.com."),
|
||||
MX("@", 20, "aspmx2.migadu.com."),
|
||||
@@ -37,6 +34,12 @@ D("radicle.xyz", REG_NONE, DnsProvider(DSP_CLOUDFLARE),
|
||||
// Google Search Console
|
||||
TXT("@", "\"google-site-verification=UkriKVl03GNNPh5ERcdOgc2UYd2bBqHg9sklcBcReaU\""),
|
||||
|
||||
// Bluesky
|
||||
TXT("_atproto", "\"did=did:plc:h3rhdktoagtwfu452cjyw3df\""),
|
||||
|
||||
// GitHub
|
||||
TXT("_gh-radicle-dev-o", "\"4e6be9a82e\""),
|
||||
|
||||
|
||||
PTR("b._dns-sd._udp", "radicle.xyz."),
|
||||
PTR("lb._dns-sd._udp", "radicle.xyz."),
|
||||
@@ -69,12 +72,6 @@ D("radicle.xyz", REG_NONE, DnsProvider(DSP_CLOUDFLARE),
|
||||
TXT("rosa._radicle-node._tcp", "\"nid=z6Mkmqogy2qEM2ummccUthFEaaHvyYmYBYh3dbe9W4ebScxo\""),
|
||||
|
||||
|
||||
CNAME("search", "search.radicle.garden."),
|
||||
|
||||
|
||||
CNAME("releases", "public.r2.dev.", CF_PROXY_ON),
|
||||
|
||||
|
||||
A("seed", "65.108.87.205"),
|
||||
AAAA("seed", "2a01:4f9:c011:b666::1"),
|
||||
SSHFP("seed", 4, 2, "ac7db28d3d05c52f3e2d67adca4654ce6766a1e8d7b6fab4c03b25ab435a613d"),
|
||||
@@ -88,13 +85,19 @@ D("radicle.xyz", REG_NONE, DnsProvider(DSP_CLOUDFLARE),
|
||||
ALIAS("metrics", "seed"),
|
||||
ALIAS("vault", "seed"),
|
||||
|
||||
// LOC("seed", "60 20 36.488 N 25 01 48.587 E 46m 10m 100m 100m"),
|
||||
|
||||
PTR("_radicle-node._tcp", "seed._radicle-node._tcp.radicle.xyz."),
|
||||
SRV("seed._radicle-node._tcp", 32767, 32767, 8776, "seed.radicle.xyz."),
|
||||
SRV("seed._radicle-node._tcp", 32767, 32767, 58776, "seed.radicle.xyz."),
|
||||
TXT("seed._radicle-node._tcp", "\"nid=z6MksmpU5b1dS7oaqF2bHXhQi1DWy2hB7Mh9CuN7y1DN6QSz\""),
|
||||
|
||||
|
||||
CNAME("search", "search.radicle.garden."),
|
||||
|
||||
|
||||
CNAME("releases", "public.r2.dev.", CF_PROXY_ON),
|
||||
|
||||
|
||||
NS("bootstrap", "seed"),
|
||||
|
||||
|
||||
@@ -103,6 +106,14 @@ D("radicle.xyz", REG_NONE, DnsProvider(DSP_CLOUDFLARE),
|
||||
|
||||
D("radicle.dev", REG_NONE, DnsProvider(DSP_CLOUDFLARE),
|
||||
AAAA("@", "100::", CF_PROXY_ON),
|
||||
AAAA("desktop", "100::", CF_PROXY_ON),
|
||||
|
||||
|
||||
CNAME("docs", "radicle.dev."),
|
||||
CNAME("www", "radicle.dev."),
|
||||
|
||||
|
||||
CNAME("toot", "vip.masto.host."),
|
||||
|
||||
|
||||
// Migadu
|
||||
@@ -123,13 +134,46 @@ D("radicle.dev", REG_NONE, DnsProvider(DSP_CLOUDFLARE),
|
||||
// Google Search Console
|
||||
TXT("@", "\"google-site-verification=r8cK7DIKc0RWNAOBhyHmfOb9FSwrCKiZs2JQ6cLOuK4\""),
|
||||
|
||||
// Bluesky
|
||||
TXT("_atproto", "\"did=did:plc:h3rhdktoagtwfu452cjyw3df\""),
|
||||
|
||||
// GitHub
|
||||
TXT("_gh-radicle-dev-o", "\"05261552ed\""),
|
||||
|
||||
A("blackhole", "192.0.2.1"),
|
||||
|
||||
|
||||
PTR("b._dns-sd._udp", "radicle.dev."),
|
||||
PTR("lb._dns-sd._udp", "radicle.dev."),
|
||||
PTR("_services._dns-sd._udp", "_radicle-node._tcp.radicle.dev."),
|
||||
|
||||
|
||||
A("seed", "65.108.87.205"),
|
||||
AAAA("seed", "2a01:4f9:c011:b666::1"),
|
||||
SSHFP("seed", 4, 2, "ac7db28d3d05c52f3e2d67adca4654ce6766a1e8d7b6fab4c03b25ab435a613d"),
|
||||
SSHFP("seed", 4, 1, "9033b89019264dbad5a744057166a5e1b7af92f7"),
|
||||
|
||||
ALIAS("attic", "seed"),
|
||||
ALIAS("files", "seed"),
|
||||
ALIAS("grafana", "seed"),
|
||||
ALIAS("logs", "seed"),
|
||||
ALIAS("loki", "seed"),
|
||||
ALIAS("metrics", "seed"),
|
||||
ALIAS("vault", "seed"),
|
||||
|
||||
PTR("_radicle-node._tcp", "seed._radicle-node._tcp.radicle.dev."),
|
||||
SRV("seed._radicle-node._tcp", 32767, 32767, 8776, "seed.radicle.dev."),
|
||||
SRV("seed._radicle-node._tcp", 32767, 32767, 58776, "seed.radicle.dev."),
|
||||
TXT("seed._radicle-node._tcp", "\"nid=z6MksmpU5b1dS7oaqF2bHXhQi1DWy2hB7Mh9CuN7y1DN6QSz\""),
|
||||
);
|
||||
|
||||
D("radicle.network", REG_NONE, DnsProvider(DSP_CLOUDFLARE),
|
||||
AAAA("@", "100::", CF_PROXY_ON),
|
||||
|
||||
|
||||
TXT("_gh-radicle-dev-o", "\"eed4033e97\""),
|
||||
|
||||
|
||||
// Migadu
|
||||
MX("@", 10, "aspmx1.migadu.com."),
|
||||
MX("@", 20, "aspmx2.migadu.com."),
|
||||
@@ -154,10 +198,34 @@ D("radicle.network", REG_NONE, DnsProvider(DSP_CLOUDFLARE),
|
||||
PTR("lb._dns-sd._udp", "radicle.network."),
|
||||
PTR("_services._dns-sd._udp", "_radicle-node._tcp.radicle.network."),
|
||||
|
||||
|
||||
A("iris", "95.217.156.6"),
|
||||
AAAA("iris", "2a01:4f9:c010:dfaa::1"),
|
||||
SSHFP("iris", 4, 1, "1ffe43af8f30c34373515fa24f1b9fe69532a9d5"),
|
||||
SSHFP("iris", 4, 2, "715ce29a1ccdd7088b9fb40949ca186e736ff6d711163689560ffe54252c9d43"),
|
||||
|
||||
PTR("_radicle-node._tcp", "iris._radicle-node._tcp.radicle.network."),
|
||||
SRV("iris._radicle-node._tcp", 32767, 32767, 8776, "iris.radicle.network."),
|
||||
SRV("iris._radicle-node._tcp", 32767, 32767, 58776, "iris.radicle.network."),
|
||||
TXT("iris._radicle-node._tcp", "\"nid=z6MkrLMMsiPWUcNPHcRajuMi9mDfYckSoJyPwwnknocNYPm7\""),
|
||||
|
||||
|
||||
A("rosa", "5.161.85.124"),
|
||||
AAAA("rosa", "2a01:4ff:f0:abd3::1"),
|
||||
SSHFP("rosa", 4, 1, "6ee4b941f49ece1601e238344f088f5a83712b91"),
|
||||
SSHFP("rosa", 4, 2, "e2364a3e0f7728eaa53d40543f15e7c23409fe06e5b08c55d8f63ee00e963b0b"),
|
||||
|
||||
PTR("_radicle-node._tcp", "rosa._radicle-node._tcp.radicle.network."),
|
||||
SRV("rosa._radicle-node._tcp", 32767, 32767, 8776, "rosa.radicle.network."),
|
||||
SRV("rosa._radicle-node._tcp", 32767, 32767, 58776, "rosa.radicle.network."),
|
||||
TXT("rosa._radicle-node._tcp", "\"nid=z6Mkmqogy2qEM2ummccUthFEaaHvyYmYBYh3dbe9W4ebScxo\""),
|
||||
|
||||
|
||||
CNAME("search", "search.radicle.garden."),
|
||||
|
||||
|
||||
NS("bootstrap", "seed.radicle.xyz."),
|
||||
NS("bootstrap", "seed.radicle.dev."),
|
||||
|
||||
|
||||
A("blackhole", "192.0.2.1"),
|
||||
);
|
||||
@@ -184,4 +252,6 @@ D("radicle.community", REG_NONE, DnsProvider(DSP_CLOUDFLARE),
|
||||
|
||||
// Google Search Console
|
||||
TXT("@", "\"google-site-verification=UEvCt4qHEQtB1ql2LREQumXpl291d6ajUm70A3g_j94\""),
|
||||
|
||||
A("blackhole", "192.0.2.1"),
|
||||
);
|
||||
|
||||
@@ -153,9 +153,9 @@
|
||||
result;
|
||||
in {
|
||||
nixosConfigurations = {
|
||||
seed = host (import ./os/host/seed);
|
||||
iris = host (import ./os/host/iris);
|
||||
rosa = host (import ./os/host/rosa);
|
||||
"seed.radicle.dev" = host (import ./os/host/dev/seed);
|
||||
"iris.radicle.network" = host (import ./os/host/network/iris);
|
||||
"rosa.radicle.network" = host (import ./os/host/network/rosa);
|
||||
};
|
||||
|
||||
devShells.${system}.default = pkgs.mkShell {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{config, ...}: let
|
||||
domain = "attic.radicle.xyz";
|
||||
domain = "attic.radicle.dev";
|
||||
port = 54862;
|
||||
secret = "atticd.env";
|
||||
in {
|
||||
@@ -38,5 +38,11 @@ in {
|
||||
'';
|
||||
};
|
||||
};
|
||||
nginx.virtualHosts."attic.radicle.xyz" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
globalRedirect = domain;
|
||||
redirectCode = 302;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -16,7 +16,7 @@
|
||||
--from-file "${./zone.jq}" \
|
||||
> "/etc/knot/dns-sd.zone"
|
||||
|
||||
knotc -b zone-reload "bootstrap.radicle.xyz"
|
||||
knotc -b zone-reload "bootstrap.radicle.network"
|
||||
'';
|
||||
wants = ["knot.service"];
|
||||
requires = ["knot.service"];
|
||||
@@ -35,11 +35,11 @@
|
||||
wantedBy = ["timers.target"];
|
||||
};
|
||||
};
|
||||
services.nginx.virtualHosts."bootstrap.radicle.xyz" = {
|
||||
services.nginx.virtualHosts."bootstrap.radicle.network" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
serverName = "bootstrap.radicle.xyz";
|
||||
root = "/var/www/bootstrap.radicle.xyz";
|
||||
serverName = "bootstrap.radicle.network";
|
||||
root = "/var/www/bootstrap.radicle.network";
|
||||
locations."/".extraConfig = ''
|
||||
add_header 'Access-Control-Allow-Origin' '*';
|
||||
autoindex on;
|
||||
@@ -7,13 +7,13 @@
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
../../mixin/cache.nix
|
||||
../../mixin/common.nix
|
||||
../../mixin/kmscon.nix
|
||||
../../mixin/nix.nix
|
||||
../../mixin/motd.nix
|
||||
../../mixin/sops.nix
|
||||
../../mixin/users.nix
|
||||
../../../mixin/cache.nix
|
||||
../../../mixin/common.nix
|
||||
../../../mixin/kmscon.nix
|
||||
../../../mixin/nix.nix
|
||||
../../../mixin/motd.nix
|
||||
../../../mixin/sops.nix
|
||||
../../../mixin/users.nix
|
||||
|
||||
./attic.nix
|
||||
./knot.nix
|
||||
@@ -83,6 +83,7 @@
|
||||
};
|
||||
|
||||
networking = {
|
||||
domain = "radicle.dev";
|
||||
hostName = "seed";
|
||||
useDHCP = false;
|
||||
|
||||
@@ -1,21 +1,35 @@
|
||||
let
|
||||
name = "files.radicle.xyz";
|
||||
name = {
|
||||
xyz = "files.radicle.xyz";
|
||||
dev = "files.radicle.dev";
|
||||
};
|
||||
in {
|
||||
fileSystems."/var/www/${name}" = {
|
||||
fileSystems."/var/www/${name.dev}" = {
|
||||
device = "/dev/disk/by-id/scsi-0HC_Volume_30083854";
|
||||
fsType = "ext4";
|
||||
options = ["discard" "defaults"];
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts.${name} = {
|
||||
root = "/var/www/${name}";
|
||||
services.nginx.virtualHosts.${name.xyz} = {
|
||||
globalRedirect = name.dev;
|
||||
redirectCode = 302;
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
serverName = name.xyz;
|
||||
extraConfig = ''
|
||||
add_header 'Access-Control-Allow-Origin' '*';
|
||||
'';
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts.${name.dev} = {
|
||||
root = "/var/www/${name.dev}";
|
||||
extraConfig = ''
|
||||
add_header 'Access-Control-Allow-Origin' '*';
|
||||
autoindex on;
|
||||
'';
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
serverName = name;
|
||||
serverName = name.dev;
|
||||
};
|
||||
|
||||
users.users = {
|
||||
@@ -3,7 +3,7 @@
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
domain = "grafana.radicle.xyz";
|
||||
domain = "grafana.radicle.dev";
|
||||
port = 3000;
|
||||
in {
|
||||
services = {
|
||||
@@ -31,5 +31,12 @@ in {
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
nginx.virtualHosts."grafana.radicle.xyz" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
globalRedirect = domain;
|
||||
redirectCode = 302;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -24,9 +24,9 @@
|
||||
in {
|
||||
environment.etc."knot/common.zone".source = ./zone/common.zone;
|
||||
environment.etc."knot/secondaries.zone".source = ./zone/secondaries.zone;
|
||||
environment.etc."knot/bootstrap.radicle.xyz.zone".text = ''
|
||||
environment.etc."knot/bootstrap.radicle.network.zone".text = ''
|
||||
$TTL 3600
|
||||
@ SOA ns1 lorenz\.leutgeb.radicle.xyz. 2025101002 14400 3600 1209600 3600
|
||||
@ SOA ns1 lorenz\.leutgeb.radicle.dev. 2025101002 14400 3600 1209600 3600
|
||||
$INCLUDE common.zone
|
||||
$INCLUDE dns-sd.zone
|
||||
'';
|
||||
@@ -190,7 +190,7 @@ in {
|
||||
zone = [
|
||||
{
|
||||
file = "/etc/knot/bootstrap.zone";
|
||||
domain = "bootstrap.radicle.xyz";
|
||||
domain = "bootstrap.radicle.network";
|
||||
template = "primary";
|
||||
dnssec-signing = true;
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
../../../mixin/radicle.nix
|
||||
../../../mixin/radicle-stats.nix
|
||||
];
|
||||
|
||||
fileSystems."/var/lib/radicle" = {
|
||||
device = "/dev/disk/by-id/scsi-0HC_Volume_30473554";
|
||||
fsType = "ext4";
|
||||
options = ["discard" "defaults"];
|
||||
};
|
||||
|
||||
services.radicle = {
|
||||
httpd.nginx.serverAliases = ["seed.radicle.xyz"];
|
||||
|
||||
settings = {
|
||||
fetch.signedReferences.featureLevel.minimum = "parent";
|
||||
node.externalAddresses = lib.mkAfter [
|
||||
"seedradanrg2oje34eyidx4z63gpuakgaedaetvt7xxw5whv6qnexmid.onion:58776"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -5,7 +5,7 @@
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
../../mixin/ssh.nix
|
||||
../../../mixin/ssh.nix
|
||||
];
|
||||
|
||||
sops.secrets ."ssh/key".sopsFile = ./sops/ssh.yaml;
|
||||
@@ -1,6 +1,6 @@
|
||||
let
|
||||
secret = "tor/hs_ed25519_secret_key";
|
||||
in {
|
||||
imports = [../../mixin/tor.nix];
|
||||
imports = [../../../mixin/tor.nix];
|
||||
sops.secrets.${secret}.sopsFile = ./sops/tor_hs_ed25519_secret_key.bin.json;
|
||||
}
|
||||
@@ -2,7 +2,7 @@ $TTL 3600
|
||||
|
||||
@ CAA 0 issue "letsencrypt.org"
|
||||
|
||||
NS seed.radicle.xyz
|
||||
NS seed.radicle.dev
|
||||
|
||||
A 65.108.87.205
|
||||
AAAA 2a01:4f9:c011:b666::1
|
||||
@@ -10,8 +10,8 @@ $TTL 3600
|
||||
* A 65.108.87.205
|
||||
AAAA 2a01:4f9:c011:b666::1
|
||||
|
||||
b._dns-sd._udp 86400 PTR bootstrap.radicle.xyz.
|
||||
db._dns-sd._udp 86400 PTR bootstrap.radicle.xyz.
|
||||
lb._dns-sd._udp 86400 PTR bootstrap.radicle.xyz.
|
||||
b._dns-sd._udp 86400 PTR bootstrap.radicle.network.
|
||||
db._dns-sd._udp 86400 PTR bootstrap.radicle.network.
|
||||
lb._dns-sd._udp 86400 PTR bootstrap.radicle.network.
|
||||
|
||||
_services._dns-sd._udp 86400 PTR _radicle-node._tcp
|
||||
@@ -7,14 +7,14 @@
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
../../mixin/cache.nix
|
||||
../../mixin/common.nix
|
||||
../../mixin/disk-config.nix
|
||||
../../mixin/kmscon.nix
|
||||
../../mixin/motd.nix
|
||||
../../mixin/nix.nix
|
||||
../../mixin/sops.nix
|
||||
../../mixin/users.nix
|
||||
../../../mixin/cache.nix
|
||||
../../../mixin/common.nix
|
||||
../../../mixin/disk-config.nix
|
||||
../../../mixin/kmscon.nix
|
||||
../../../mixin/motd.nix
|
||||
../../../mixin/nix.nix
|
||||
../../../mixin/sops.nix
|
||||
../../../mixin/users.nix
|
||||
|
||||
./ssh.nix
|
||||
./radicle.nix
|
||||
@@ -35,6 +35,7 @@
|
||||
};
|
||||
|
||||
networking = {
|
||||
domain = "radicle.network";
|
||||
hostName = "iris";
|
||||
useDHCP = false;
|
||||
|
||||
@@ -5,9 +5,9 @@
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
../../mixin/radicle.nix
|
||||
../../mixin/radicle-permissive.nix
|
||||
../../mixin/radicle-stats.nix
|
||||
../../../mixin/radicle.nix
|
||||
../../../mixin/radicle-permissive.nix
|
||||
../../../mixin/radicle-stats.nix
|
||||
];
|
||||
|
||||
fileSystems."/var/lib/radicle" = {
|
||||
@@ -17,8 +17,9 @@
|
||||
};
|
||||
|
||||
services.radicle = {
|
||||
httpd.nginx.serverAliases = ["seed.radicle.garden"];
|
||||
httpd.nginx.serverAliases = ["seed.radicle.garden" "iris.radicle.xyz" "iris.radicle.network"];
|
||||
settings.node.externalAddresses = lib.mkAfter [
|
||||
"iris.radicle.xyz:58776"
|
||||
"irisradizskwweumpydlj4oammoshkxxjur3ztcmo7cou5emc6s5lfid.onion:58776"
|
||||
];
|
||||
};
|
||||
@@ -5,7 +5,7 @@
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
../../mixin/ssh.nix
|
||||
../../../mixin/ssh.nix
|
||||
];
|
||||
|
||||
sops.secrets."ssh/key".sopsFile = ./sops/ssh.yaml;
|
||||
@@ -1,6 +1,6 @@
|
||||
let
|
||||
secret = "tor/hs_ed25519_secret_key";
|
||||
in {
|
||||
imports = [../../mixin/tor.nix];
|
||||
imports = [../../../mixin/tor.nix];
|
||||
sops.secrets.${secret}.sopsFile = ./sops/tor_hs_ed25519_secret_key.bin.json;
|
||||
}
|
||||
@@ -7,14 +7,14 @@
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
../../mixin/cache.nix
|
||||
../../mixin/common.nix
|
||||
../../mixin/disk-config.nix
|
||||
../../mixin/kmscon.nix
|
||||
../../mixin/motd.nix
|
||||
../../mixin/nix.nix
|
||||
../../mixin/sops.nix
|
||||
../../mixin/users.nix
|
||||
../../../mixin/cache.nix
|
||||
../../../mixin/common.nix
|
||||
../../../mixin/disk-config.nix
|
||||
../../../mixin/kmscon.nix
|
||||
../../../mixin/motd.nix
|
||||
../../../mixin/nix.nix
|
||||
../../../mixin/sops.nix
|
||||
../../../mixin/users.nix
|
||||
|
||||
./ssh.nix
|
||||
./radicle.nix
|
||||
@@ -35,6 +35,7 @@
|
||||
};
|
||||
|
||||
networking = {
|
||||
domain = "radicle.network";
|
||||
hostName = "rosa";
|
||||
useDHCP = false;
|
||||
|
||||
@@ -5,9 +5,9 @@
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
../../mixin/radicle.nix
|
||||
../../mixin/radicle-permissive.nix
|
||||
../../mixin/radicle-stats.nix
|
||||
../../../mixin/radicle.nix
|
||||
../../../mixin/radicle-permissive.nix
|
||||
../../../mixin/radicle-stats.nix
|
||||
];
|
||||
|
||||
fileSystems."/var/lib/radicle" = {
|
||||
@@ -17,8 +17,9 @@
|
||||
};
|
||||
|
||||
services.radicle = {
|
||||
httpd.nginx.serverAliases = ["ash.radicle.garden"];
|
||||
httpd.nginx.serverAliases = ["ash.radicle.garden" "rosa.radicle.xyz" "rosa.radicle.network"];
|
||||
settings.node.externalAddresses = lib.mkAfter [
|
||||
"rosa.radicle.xyz:58776"
|
||||
"rosarad5bxgdlgjnzzjygnsxrwxmoaj4vn7xinlstwglxvyt64jlnhyd.onion:58776"
|
||||
];
|
||||
};
|
||||
@@ -5,7 +5,7 @@
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
../../mixin/ssh.nix
|
||||
../../../mixin/ssh.nix
|
||||
];
|
||||
|
||||
sops.secrets."ssh/key".sopsFile = ./sops/ssh.yaml;
|
||||
@@ -1,6 +1,6 @@
|
||||
let
|
||||
secret = "tor/hs_ed25519_secret_key";
|
||||
in {
|
||||
imports = [../../mixin/tor.nix];
|
||||
imports = [../../../mixin/tor.nix];
|
||||
sops.secrets.${secret}.sopsFile = ./sops/tor_hs_ed25519_secret_key.bin.json;
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
../../mixin/radicle.nix
|
||||
../../mixin/radicle-stats.nix
|
||||
];
|
||||
|
||||
fileSystems."/var/lib/radicle" = {
|
||||
device = "/dev/disk/by-id/scsi-0HC_Volume_30473554";
|
||||
fsType = "ext4";
|
||||
options = ["discard" "defaults"];
|
||||
};
|
||||
|
||||
services.radicle.settings = {
|
||||
fetch.signedReferences.featureLevel.minimum = "parent";
|
||||
node.externalAddresses = lib.mkAfter [
|
||||
"seedradanrg2oje34eyidx4z63gpuakgaedaetvt7xxw5whv6qnexmid.onion:58776"
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -7,7 +7,6 @@
|
||||
i18n.defaultLocale = "en_US.UTF-8";
|
||||
|
||||
networking = {
|
||||
domain = "radicle.xyz";
|
||||
useNetworkd = true;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user