test
This commit is contained in:
shobu
parent
26ac144938
commit
c901116678
@ -11,5 +11,5 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: cachix/install-nix-action@v31
|
||||
- run: nix run github:nicknovitski/nix-develop/v1
|
||||
- run: https://github.com/nicknovitski/nix-develop@v1
|
||||
- run: colmena apply
|
||||
|
||||
42
flake.lock
generated
42
flake.lock
generated
@ -8,11 +8,11 @@
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1754433428,
|
||||
"narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=",
|
||||
"lastModified": 1762618334,
|
||||
"narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
|
||||
"owner": "ryantm",
|
||||
"repo": "agenix",
|
||||
"rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d",
|
||||
"rev": "fcdea223397448d35d9b31f798479227e80183f6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -30,11 +30,11 @@
|
||||
"stable": "stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1755272288,
|
||||
"narHash": "sha256-ypTPb2eKcOBbOoyvPV0j4ZOXs4kayo73/2KI456QnE0=",
|
||||
"lastModified": 1762034856,
|
||||
"narHash": "sha256-QVey3iP3UEoiFVXgypyjTvCrsIlA4ecx6Acaz5C8/PQ=",
|
||||
"owner": "zhaofengli",
|
||||
"repo": "colmena",
|
||||
"rev": "5bf4ce6a24adba74a5184f4a9bef01d545a09473",
|
||||
"rev": "349b035a5027f23d88eeb3bc41085d7ee29f18ed",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -49,11 +49,11 @@
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1760309387,
|
||||
"narHash": "sha256-yCjkJuQbt6DjdS1XJL2uwyLu1AcmDvlyMGojBq8Ua38=",
|
||||
"lastModified": 1762095388,
|
||||
"narHash": "sha256-7Q8LtcvKWHbP8znARRTOY2tpU5WoV6FHwp5TZJOI8Us=",
|
||||
"owner": "9001",
|
||||
"repo": "copyparty",
|
||||
"rev": "d099e5e84e191d67a7bffa574ab39b6d0d4f6adf",
|
||||
"rev": "ac085b8149ff50e03d260128596dd130ed1c7cae",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -91,11 +91,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1758287904,
|
||||
"narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=",
|
||||
"lastModified": 1762276996,
|
||||
"narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "67ff9807dd148e704baadbd4fd783b54282ca627",
|
||||
"rev": "af087d076d3860760b3323f6b583f4d828c1ac17",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -233,11 +233,11 @@
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1760234253,
|
||||
"narHash": "sha256-ElkSuw4RxtyOY3mThezUpOM8c0fTNWlL0we/deGiTZU=",
|
||||
"lastModified": 1762826586,
|
||||
"narHash": "sha256-KlPcXOxxyv+KNcf7yNFQ4DGVFbOpITqHfvMcAUYrL7E=",
|
||||
"owner": "Infinidoge",
|
||||
"repo": "nix-minecraft",
|
||||
"rev": "a82ae8f5079a134d33337cf211d7617f1268b301",
|
||||
"rev": "1a4fa22ec6e9f2ece24fca273352463b75f6f7c0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -311,11 +311,11 @@
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1759994382,
|
||||
"narHash": "sha256-wSK+3UkalDZRVHGCRikZ//CyZUJWDJkBDTQX1+G77Ow=",
|
||||
"lastModified": 1762756533,
|
||||
"narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5da4a26309e796daa7ffca72df93dbe53b8164c7",
|
||||
"rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -573,11 +573,11 @@
|
||||
},
|
||||
"unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1760038930,
|
||||
"narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=",
|
||||
"lastModified": 1762596750,
|
||||
"narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3",
|
||||
"rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@ -78,7 +78,7 @@
|
||||
./modules/gitea/${name}
|
||||
];
|
||||
|
||||
deployment.targetHost = "thea.homelab.local";
|
||||
deployment.targetHost = "192.168.1.12";
|
||||
};
|
||||
|
||||
sin = {name, nodes, pkgs, ...}: {
|
||||
@ -92,7 +92,7 @@
|
||||
./modules/gitea/${name}
|
||||
];
|
||||
|
||||
deployment.targetHost = "sin.homelab.local";
|
||||
deployment.targetHost = "192.168.1.14";
|
||||
};
|
||||
};
|
||||
devShells = forEachSupportedSystem ({ pkgs }: {
|
||||
|
||||
@ -29,9 +29,11 @@
|
||||
networking = {
|
||||
hostName = "sin";
|
||||
|
||||
nameservers = [ "10.0.0.4" ];
|
||||
networkmanager.enable = true;
|
||||
|
||||
dhcpcd.extraConfig = "nohook resolv.conf";
|
||||
# nameservers = [ "10.0.0.4" ];
|
||||
|
||||
# dhcpcd.extraConfig = "nohook resolv.conf";
|
||||
|
||||
firewall = {
|
||||
allowedTCPPorts = [
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{...}: {
|
||||
services.coredns = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
config = ''
|
||||
homelab.local {
|
||||
log
|
||||
|
||||
@ -2,7 +2,9 @@
|
||||
# your system. Help is available in the configuration.nix(5) man page, on
|
||||
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
|
||||
|
||||
{ config, lib, pkgs, nodes, ... }:
|
||||
{ config, lib, pkgs, nodes, ... }:let
|
||||
sin-address = "192.168.1.14";
|
||||
in
|
||||
|
||||
{
|
||||
imports =
|
||||
@ -22,9 +24,11 @@
|
||||
networking = {
|
||||
hostName = "thea"; # Define your hostname.
|
||||
|
||||
nameservers = [ "10.0.0.4" ];
|
||||
networkmanager.enable = true;
|
||||
|
||||
dhcpcd.extraConfig = "nohook resolv.conf";
|
||||
# nameservers = [ "10.0.0.4" ];
|
||||
|
||||
# dhcpcd.extraConfig = "nohook resolv.conf";
|
||||
|
||||
firewall = {
|
||||
allowedTCPPorts = [ nodes.sin.config.services.gitea.settings.server.SSH_PORT ];
|
||||
@ -37,7 +41,7 @@
|
||||
# TODO refactor this in the gitea/n100 module
|
||||
sourcePort = nodes.sin.config.services.gitea.settings.server.SSH_PORT;
|
||||
proto = "tcp";
|
||||
destination = "10.0.0.4:22";
|
||||
destination = "${sin-address}:22";
|
||||
} ];
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
{inputs, ...}:
|
||||
let
|
||||
striped-front = inputs.striped-front;
|
||||
|
||||
sin-address = "192.168.1.14";
|
||||
in {
|
||||
|
||||
networking.firewall.allowedTCPPorts = [ 80 443 8448 ];
|
||||
@ -18,7 +20,7 @@ in {
|
||||
forceSSL = true;
|
||||
|
||||
locations."/" = {
|
||||
proxyPass = "http://10.0.0.4:${port}";
|
||||
proxyPass = "http://${sin-address}:${port}";
|
||||
proxyWebsockets = true;
|
||||
extraConfig = ''
|
||||
proxy_ssl_server_name on;
|
||||
@ -57,7 +59,7 @@ in {
|
||||
forceSSL = true;
|
||||
|
||||
locations."/" = {
|
||||
proxyPass = "http://10.0.0.4:8001";
|
||||
proxyPass = "http://${sin-address}:8001";
|
||||
extraConfig = ''
|
||||
proxy_ssl_server_name on;
|
||||
'';
|
||||
@ -68,7 +70,7 @@ in {
|
||||
forceSSL = true;
|
||||
|
||||
locations."/" = {
|
||||
proxyPass = "http://10.0.0.4:8000";
|
||||
proxyPass = "http://${sin-address}:8000";
|
||||
proxyWebsockets = true;
|
||||
extraConfig = ''
|
||||
proxy_ssl_server_name on;
|
||||
@ -86,7 +88,7 @@ in {
|
||||
forceSSL = true;
|
||||
|
||||
locations."/" = {
|
||||
proxyPass = "http://10.0.0.4:8082";
|
||||
proxyPass = "http://${sin-address}:8082";
|
||||
};
|
||||
};
|
||||
"git.shobu.fr" = {
|
||||
@ -94,7 +96,7 @@ in {
|
||||
forceSSL = true;
|
||||
|
||||
locations."/" = {
|
||||
proxyPass = "http://10.0.0.4:3000";
|
||||
proxyPass = "http://${sin-address}:3000";
|
||||
};
|
||||
};
|
||||
"files.shobu.fr" = {
|
||||
@ -102,7 +104,7 @@ in {
|
||||
forceSSL = true;
|
||||
|
||||
locations."/" = {
|
||||
proxyPass = "http://10.0.0.4:8086";
|
||||
proxyPass = "http://${sin-address}:8086";
|
||||
};
|
||||
};
|
||||
# "matrix.shobu.fr" = {
|
||||
@ -111,9 +113,9 @@ in {
|
||||
# locations."/".extraConfig = ''
|
||||
# return 404;
|
||||
# '';
|
||||
# locations."/_matrix".proxyPass = "http://10.0.0.4:8008";
|
||||
# locations."/_synapse/client".proxyPass = "http://10.0.0.4:8008";
|
||||
# locations."/.well-known/matrix/server".proxyPass = "http://10.0.0.4:8008/.well-known/matrix/server";
|
||||
# locations."/_matrix".proxyPass = "http://${sin-address}:8008";
|
||||
# locations."/_synapse/client".proxyPass = "http://${sin-address}:8008";
|
||||
# locations."/.well-known/matrix/server".proxyPass = "http://${sin-address}:8008/.well-known/matrix/server";
|
||||
# };
|
||||
}
|
||||
);
|
||||
|
||||
@ -1,10 +1,13 @@
|
||||
{...}: {
|
||||
{...}: let
|
||||
sin-address = "192.168.1.14";
|
||||
in
|
||||
{
|
||||
boot.supportedFilesystems = [ "fuse.sshfs" ];
|
||||
programs.fuse.userAllowOther = true;
|
||||
|
||||
fileSystems = {
|
||||
"/mnt/shares/data" = {
|
||||
device = "shobu@10.0.0.4:/mnt/data/";
|
||||
device = "shobu@${sin-address}:/mnt/data/";
|
||||
fsType = "fuse.sshfs";
|
||||
options = [
|
||||
"debug"
|
||||
|
||||
@ -1,10 +1,12 @@
|
||||
{nodes, ...}:{
|
||||
{nodes, ...}:let
|
||||
sin-address = "192.168.1.14";
|
||||
in{
|
||||
imports = [
|
||||
./virtualisation.nix
|
||||
];
|
||||
networking.nat.forwardPorts = [{
|
||||
sourcePort = nodes.sin.config.services.gitea.settings.server.SSH_PORT;
|
||||
proto = "tcp";
|
||||
destination = "10.0.0.4:22";
|
||||
destination = "${sin-address}:22";
|
||||
}];
|
||||
}
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
name = "config.yml";
|
||||
text = ''
|
||||
container:
|
||||
network: "bridge"
|
||||
network: "host"
|
||||
'';
|
||||
};
|
||||
in {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user