forked from rarias/jungle
Compare commits
14 Commits
0aa846c31c
...
7d1e824064
| Author | SHA1 | Date | |
|---|---|---|---|
| 7d1e824064 | |||
| ffa089fa63 | |||
| b8345ae974 | |||
| 637f026d29 | |||
| fdfd6090a3 | |||
| bde0da03a4 | |||
| 7a850ecfbc | |||
| 60b9ba4c82 | |||
| 1f3c3d0ff4 | |||
| 7980d00495 | |||
| 4539579576 | |||
| cb76e7da6d | |||
| 41f8aea67e | |||
| 91fa59e397 |
@ -11,7 +11,7 @@
|
|||||||
./base/hw.nix
|
./base/hw.nix
|
||||||
./base/net.nix
|
./base/net.nix
|
||||||
./base/nix.nix
|
./base/nix.nix
|
||||||
./base/sys-devices.nix
|
./base/nosv.nix
|
||||||
./base/ntp.nix
|
./base/ntp.nix
|
||||||
./base/rev.nix
|
./base/rev.nix
|
||||||
./base/ssh.nix
|
./base/ssh.nix
|
||||||
|
|||||||
9
m/common/base/nosv.nix
Normal file
9
m/common/base/nosv.nix
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
{ ... }:
|
||||||
|
{
|
||||||
|
nix.settings.system-features = [ "nosv" ];
|
||||||
|
programs.nix-required-mounts.enable = true;
|
||||||
|
programs.nix-required-mounts.allowedPatterns.nosv.paths = [
|
||||||
|
"/sys/devices/system/cpu"
|
||||||
|
"/sys/devices/system/node"
|
||||||
|
];
|
||||||
|
}
|
||||||
@ -1,9 +0,0 @@
|
|||||||
{
|
|
||||||
nix.settings.system-features = [ "sys-devices" ];
|
|
||||||
|
|
||||||
programs.nix-required-mounts.enable = true;
|
|
||||||
programs.nix-required-mounts.allowedPatterns.sys-devices.paths = [
|
|
||||||
"/sys/devices/system/cpu"
|
|
||||||
"/sys/devices/system/node"
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@ -23,11 +23,11 @@
|
|||||||
|
|
||||||
peers = [
|
peers = [
|
||||||
# List of allowed peers.
|
# List of allowed peers.
|
||||||
{
|
{
|
||||||
name = "apex";
|
name = "apex";
|
||||||
publicKey = "VwhcN8vSOzdJEotQTpmPHBC52x3Hbv1lkFIyKubrnUA=";
|
publicKey = "VwhcN8vSOzdJEotQTpmPHBC52x3Hbv1lkFIyKubrnUA=";
|
||||||
# List of IPs assigned to this peer within the tunnel subnet. Used to configure routing.
|
# List of IPs assigned to this peer within the tunnel subnet. Used to configure routing.
|
||||||
allowedIPs = [ "10.106.0.30/32" "10.0.40.7/32" ];
|
allowedIPs = [ "10.106.0.30/32" ];
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "raccoon";
|
name = "raccoon";
|
||||||
@ -40,7 +40,6 @@
|
|||||||
|
|
||||||
networking.hosts = {
|
networking.hosts = {
|
||||||
"10.106.0.30" = [ "apex" ];
|
"10.106.0.30" = [ "apex" ];
|
||||||
"10.0.40.7" = [ "hut" ];
|
|
||||||
"10.106.0.236" = [ "raccoon" ];
|
"10.106.0.236" = [ "raccoon" ];
|
||||||
"10.0.44.4" = [ "tent" ];
|
"10.0.44.4" = [ "tent" ];
|
||||||
};
|
};
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
{ lib, pkgs, ... }:
|
{ lib, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
@ -33,21 +33,4 @@
|
|||||||
} ];
|
} ];
|
||||||
};
|
};
|
||||||
|
|
||||||
services.nix-serve = {
|
|
||||||
enable = true;
|
|
||||||
# Only listen locally, as we serve it via ssh
|
|
||||||
bindAddress = "127.0.0.1";
|
|
||||||
port = 5000;
|
|
||||||
package = pkgs.nix-serve-ng.overrideAttrs (oldAttrs: {
|
|
||||||
src = pkgs.fetchgit {
|
|
||||||
url = "https://jungle.bsc.es/git/abonerib/nix-serve-ng.git";
|
|
||||||
hash = "";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
# secretKeyFile = config.age.secrets.nixServe.path;
|
|
||||||
# Public key:
|
|
||||||
# jungle.bsc.es:pEc7MlAT0HEwLQYPtpkPLwRsGf80ZI26aj29zMw/HH0=
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user