Added SMB share and Monitoring
This commit is contained in:
@@ -1,12 +1,13 @@
|
||||
{
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
./smb.nix
|
||||
../../nixos/roles/monitoring.nix
|
||||
../../nixos/roles/matrix.nix
|
||||
../../nixos/roles/postgresql.nix
|
||||
../../nixos/roles/wyl.nix
|
||||
../../nixos/roles/adguard.nix
|
||||
# ../../nixos/roles/unifi.nix
|
||||
../../nixos/roles/unifi.nix
|
||||
../../nixos/roles/searxng.nix
|
||||
../../nixos/roles/filebrowser.nix
|
||||
../../nixos/roles/gitea.nix
|
||||
|
||||
82
hosts/cyper-controller/smb.nix
Normal file
82
hosts/cyper-controller/smb.nix
Normal file
@@ -0,0 +1,82 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
primaryUser,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
sops.secrets.smb_passwd = { };
|
||||
|
||||
users.users.${primaryUser}.extraGroups = [ "sambashare" ];
|
||||
|
||||
services.samba = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
|
||||
settings = {
|
||||
global = {
|
||||
"workgroup" = "WORKGROUP";
|
||||
"server string" = "%h (Samba)";
|
||||
"server role" = "standalone server";
|
||||
"security" = "user";
|
||||
"map to guest" = "Never";
|
||||
"invalid users" = [ "root" ];
|
||||
"socket options" = "TCP_NODELAY IPTOS_LOWDELAY";
|
||||
"use sendfile" = "yes";
|
||||
"log level" = "1";
|
||||
"log file" = "/var/log/samba/log.%m";
|
||||
"max log size" = "1000";
|
||||
};
|
||||
|
||||
storage-internal = {
|
||||
"path" = "/storage/internal";
|
||||
"comment" = "Internal storage (btrfs)";
|
||||
"browseable" = "yes";
|
||||
"read only" = "no";
|
||||
"valid users" = primaryUser;
|
||||
"create mask" = "0664";
|
||||
"directory mask" = "0775";
|
||||
"force user" = primaryUser;
|
||||
};
|
||||
|
||||
storage-fast = {
|
||||
"path" = "/storage/fast";
|
||||
"comment" = "Fast storage";
|
||||
"browseable" = "yes";
|
||||
"read only" = "no";
|
||||
"valid users" = primaryUser;
|
||||
"create mask" = "0664";
|
||||
"directory mask" = "0775";
|
||||
"force user" = primaryUser;
|
||||
};
|
||||
|
||||
storage-backup = {
|
||||
"path" = "/storage/backup";
|
||||
"comment" = "Backup storage";
|
||||
"browseable" = "yes";
|
||||
"read only" = "yes";
|
||||
"valid users" = primaryUser;
|
||||
"force user" = primaryUser;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.samba-set-password = {
|
||||
description = "Set Samba password for ${primaryUser}";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [
|
||||
"smbd.service"
|
||||
"sops-nix.service"
|
||||
];
|
||||
requires = [ "smbd.service" ];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
ExecStart = pkgs.writeShellScript "samba-set-password" ''
|
||||
PASSWORD=$(cat /run/secrets/smb-password-phil)
|
||||
echo -e "$PASSWORD\n$PASSWORD" | ${pkgs.samba}/bin/smbpasswd -a -s ${primaryUser}
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,19 +1,170 @@
|
||||
{ pkgs, config, ... }:
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
flavours = [
|
||||
{
|
||||
name = "Latte";
|
||||
slug = "latte";
|
||||
is_dark = false;
|
||||
}
|
||||
{
|
||||
name = "Frappé";
|
||||
slug = "frappe";
|
||||
is_dark = true;
|
||||
}
|
||||
{
|
||||
name = "Macchiato";
|
||||
slug = "macchiato";
|
||||
is_dark = true;
|
||||
}
|
||||
{
|
||||
name = "Mocha";
|
||||
slug = "mocha";
|
||||
is_dark = true;
|
||||
}
|
||||
];
|
||||
|
||||
accents = [
|
||||
"rosewater"
|
||||
"flamingo"
|
||||
"pink"
|
||||
"mauve"
|
||||
"red"
|
||||
"maroon"
|
||||
"peach"
|
||||
"yellow"
|
||||
"green"
|
||||
"teal"
|
||||
"sky"
|
||||
"sapphire"
|
||||
"blue"
|
||||
"lavender"
|
||||
];
|
||||
|
||||
themeHashes = {
|
||||
"latte/rosewater" = "0l1m4bhaxdam07rfqag6pjbzhdpyi5w3i14vp6rq7aj59pildw3a";
|
||||
"latte/flamingo" = "1m8hh2l87xv2rfgpnnl5vzddmam0n82h25fwadb37blgab08vhsr";
|
||||
"latte/pink" = "0ambrc42mvg0vdspfmnl31ka1nsxpdyv1p3nh045822y02q20wwh";
|
||||
"latte/mauve" = "1nnn2w6nsr24a45jy497c2vhi8v64bwg99fj2dyhpfsn89c63lhn";
|
||||
"latte/red" = "14lmw4c4llfz6zqvfymkc6k3msxcml2gwq9rhwsixdpc5mjjbn8n";
|
||||
"latte/maroon" = "0ydpng9451mpn7hv5ag1ck8hryx8pdvrml3zksvzm2fiwzzjkpcf";
|
||||
"latte/peach" = "1fn5804wv9z9iv65ikyv015b01a7c546rsaaks2a2sq2c37n75l0";
|
||||
"latte/yellow" = "0hzgiyhqmwgp3h3v1y23sx3x5qp712sw106472lbnxbywqlavcza";
|
||||
"latte/green" = "194kxv6d9hc4nixy16hy9nvf32qs3v214nr2r2qf2z9l89rk5pnp";
|
||||
"latte/teal" = "12n25d38zpqxsskglymhmza972klg2hj3c23v2nb3jfj82llw6v4";
|
||||
"latte/sky" = "0yghds3xpmbhkbcj2jkh8df82j6vrn9q1z0s2129nca7l5g5f9w2";
|
||||
"latte/sapphire" = "18dl1srxp3xccvvy56za6kp05n68d918l0wrxga11746g9sib7r3";
|
||||
"latte/blue" = "1zv9nap21d80flvd1jwmjph05jgykxngv5kqbhk95mvqh962ygnf";
|
||||
"latte/lavender" = "03j4fwbscip1qm6px1qxkha0c5csq2wwvzg9vwjkc2ja48v1mp9k";
|
||||
|
||||
"frappe/rosewater" = "032qbgj32mvgpankl9777x2lxk18451kglsxg5215k8zrwcg9y95";
|
||||
"frappe/flamingo" = "1grhgynn8q7isv18981km5k8ll72ihsjw2ciy8widl6wikv29j8p";
|
||||
"frappe/pink" = "0h33g721bph8ihd6lmbc7szxy4dq85ng1cgg5cxjb5y2m7wpdbsy";
|
||||
"frappe/mauve" = "121jmznc9q3p7crsy9p2khw8xnzvz4lxms26g1h5wqa67wqvalc4";
|
||||
"frappe/red" = "07wm4h1giyy6a5nlh0d3qdarfsp6ikyr5nmg94n13lj4q03d0cn0";
|
||||
"frappe/maroon" = "08vg70nr918n4ffi1wnbba4xrx5ak5vfgq7m5ik0rpkb2wdb4x6k";
|
||||
"frappe/peach" = "1cg753w2dxs0sx97d8y0g62s8aw3w6b9hrll0lsrw3bc1bvm23fl";
|
||||
"frappe/yellow" = "0g43g2if1pcm25i261zfw43bawqqdlgg2f6q2bqhyqvafk9yb3dy";
|
||||
"frappe/green" = "1n71mndzds3zldb271g8hdw1yn29s68svzvh8ckjcsz4sb9h1i74";
|
||||
"frappe/teal" = "0b6m9cibfwf8csh1pk5i76xi3wx3v2aqwgffzsidw8nwc7c1a3wk";
|
||||
"frappe/sky" = "1l4d44399ixshlc9fdsx7iqwxm6kdkp6k4z3z6bdyyx6adw3z4q5";
|
||||
"frappe/sapphire" = "03fa9rnclvs5ljd0lzz15vnkzpqpbrhfppg3zwfchs9fvak0n3ni";
|
||||
"frappe/blue" = "0r4jjn3pab77w1aanlv3143ch60400q44mdzaqmcjbcr6l2knmjh";
|
||||
"frappe/lavender" = "1mrkaz72w6j9hh4dpxwgd6ks5wsnq9ydgy6f9gms4jx1611aab96";
|
||||
|
||||
"macchiato/rosewater" = "001akfnhlvwaiz5faahl4qi0qp6as6ilvkbja6bjy9f5iasr4ygp";
|
||||
"macchiato/flamingo" = "06xq3pbx4cb3pyblx2vydr4bp0ylm7866d66agg5wg5qnr356wb3";
|
||||
"macchiato/pink" = "1hb32dj0n3wx4f1wxa4n7fib2mazghwsg2ljycza9macfn2n87qn";
|
||||
"macchiato/mauve" = "1yrnp162blizc10fz2n6ls1x0di1sdjk53vpsl7mifrkcr1k2nq7";
|
||||
"macchiato/red" = "1g9s39q7459lk830vhdrfqkbzz88p3fp8k98a2ygj2hz8sycpryq";
|
||||
"macchiato/maroon" = "0ad7rx8sbkygvsgywhpjvvzmyflyhz7jlm13dr7cxj3801rxhl6d";
|
||||
"macchiato/peach" = "1m5m6afcl8s1ghn2b9n1d20fhsygnhgn0205nhpxh4bih3kg8c8m";
|
||||
"macchiato/yellow" = "0zcc26d28jaq71mz8nqssz8p0hylczirjwjxr2dkha1133vjmvy5";
|
||||
"macchiato/green" = "055xdb5jilp5fq3a1g8773rv52zr68fp4l3hs56yj6dy3bq3q22v";
|
||||
"macchiato/teal" = "1sfci2g2nvmj0v72gnxqbj0k8053qz0rl6iphfxs3pgpi1b0rczq";
|
||||
"macchiato/sky" = "0vhfmdliy8cbb0vqq3v26isvcz4sxzq0xrb4p5a6gibvxaqi6bf3";
|
||||
"macchiato/sapphire" = "1744jiv57aqz4qi52n92nrx0s1rhylgg08qqc31jr2clk9h6bw18";
|
||||
"macchiato/blue" = "1arp8r2g8ivs1xipq39d3l6cvx0zrr1vwv9yac5j33d6c93wbb2i";
|
||||
"macchiato/lavender" = "0kak1f574c07gqjfafg3w5avrci584iqxjkmvrl2pv1879g84nn3";
|
||||
|
||||
"mocha/rosewater" = "0p3ck9crskrhk1za6knaznjlj464mx4sdkkadna6k2152m3czjpz";
|
||||
"mocha/flamingo" = "04xx1mky230saqxxqin2fph8cnnz1jhmvb9qd9f5yc3pai3q5wdw";
|
||||
"mocha/pink" = "1cj9zdd72vcc45ziav625yq6hrp1zw21f7xsic0ip065xcqzdl3p";
|
||||
"mocha/mauve" = "1wb0ibmdv6vn07bk570pikm43qdxj3n2zsqr5sip17ay05j5l6dm";
|
||||
"mocha/red" = "1mnzrk57ar2cphyi2ry2lg5ilmb26gm4pr7ixch2ls0hk8ilp9p9";
|
||||
"mocha/maroon" = "1mcpwz3yrg3kk0hkqv5nykxj07bm70403yyl8r60pqlh74dnhkbf";
|
||||
"mocha/peach" = "0jglpcs41rfqxcm45mvnbdqhma0bv4h07nc7c3nrwz3g3h2djmzr";
|
||||
"mocha/yellow" = "0jqkvcjiwid1zdvrj2ikqf5winm08qyd51nfsawfdspbfhqnzmis";
|
||||
"mocha/green" = "0bg0014a77yx7f2r6n4mxm7rqgdnymqq7cq6bvpgkfk2z1gyr38l";
|
||||
"mocha/teal" = "0kzvi3gfirpcxdhgsilm51lk3j1z6lavb7160chgd9jhzk0xg97c";
|
||||
"mocha/sky" = "057nmp2aywdxzrkmzi65bh2mvf1a9cnri0g0jdyzdnrn7f8bbsiw";
|
||||
"mocha/sapphire" = "0nfklzb0a7mxv6nzav7m2g0y9plm72vwadm06445myv3k9j3ffmj";
|
||||
"mocha/blue" = "06ay46x2aq1q5ghz2zhzhn6qyqkrrf4p9j59qywnxh1jvv728ns8";
|
||||
"mocha/lavender" = "0iip063f6km17998c7ak0lb3kq6iskyi3xv2phn618mhslnxhwm5";
|
||||
};
|
||||
|
||||
catppuccinThemes = lib.concatMap (
|
||||
flavour:
|
||||
map (
|
||||
accent:
|
||||
builtins.fromJSON (
|
||||
builtins.readFile (
|
||||
pkgs.fetchurl {
|
||||
url = "https://element.catppuccin.com/${flavour.slug}/${accent}.json";
|
||||
sha256 = themeHashes."${flavour.slug}/${accent}";
|
||||
}
|
||||
)
|
||||
)
|
||||
) accents
|
||||
) flavours;
|
||||
|
||||
elementConfig = builtins.toFile "element-config.json" (
|
||||
builtins.toJSON {
|
||||
default_server_config = {
|
||||
"m.homeserver" = {
|
||||
base_url = "https://matrix.cyperpunk.de";
|
||||
server_name = "cyperpunk.de";
|
||||
};
|
||||
};
|
||||
setting_defaults = {
|
||||
custom_themes = catppuccinThemes;
|
||||
feature_custom_themes = true;
|
||||
};
|
||||
}
|
||||
);
|
||||
|
||||
elementWebConfigured = pkgs.element-web.overrideAttrs (old: {
|
||||
postInstall = (old.postInstall or "") + ''
|
||||
cp ${elementConfig} $out/config.json
|
||||
'';
|
||||
});
|
||||
|
||||
synapseAdmin = pkgs.synapse-admin-etkecc.withConfig {
|
||||
restrictBaseUrl = [ "https://matrix.cyperpunk.de" ];
|
||||
loginFlows = [ "password" ];
|
||||
};
|
||||
in
|
||||
{
|
||||
networking.firewall = {
|
||||
allowedTCPPorts = [
|
||||
8008
|
||||
8448
|
||||
3478
|
||||
8009
|
||||
8008 # Matrix Synapse
|
||||
8009 # Cinny
|
||||
8010 # Element
|
||||
8011 # :ynapse Admin
|
||||
8448 # Matrix federation
|
||||
3478 # TURN (coturn)
|
||||
];
|
||||
allowedUDPPorts = [
|
||||
3478
|
||||
3478 # TURN (coturn)
|
||||
];
|
||||
allowedUDPPortRanges = [
|
||||
{
|
||||
from = 49152;
|
||||
to = 65535;
|
||||
to = 65535; # TURN relay ports (coturn)
|
||||
}
|
||||
];
|
||||
};
|
||||
@@ -94,8 +245,8 @@
|
||||
'';
|
||||
};
|
||||
|
||||
nginx = {
|
||||
virtualHosts."cinny" = {
|
||||
nginx.virtualHosts = {
|
||||
"cinny.cyperpunk.de" = {
|
||||
listen = [
|
||||
{
|
||||
addr = "0.0.0.0";
|
||||
@@ -103,22 +254,26 @@
|
||||
}
|
||||
];
|
||||
root = "${pkgs.cinny}";
|
||||
};
|
||||
|
||||
# locations."/config.json" = {
|
||||
# extraConfig = ''
|
||||
# default_type application/json;
|
||||
# return 200 '{
|
||||
# "defaultHomeserver":0,
|
||||
# "homeserverList": [
|
||||
# {
|
||||
# "name":"cyperpunk.de",
|
||||
# "url":"https://matrix.cyperpunk.de"
|
||||
# }
|
||||
# ],
|
||||
# "allowCustomHomeservers":true
|
||||
# }';
|
||||
# '';
|
||||
# };
|
||||
"element.cyperpunk.de" = {
|
||||
listen = [
|
||||
{
|
||||
addr = "0.0.0.0";
|
||||
port = 8010;
|
||||
}
|
||||
];
|
||||
root = "${elementWebConfigured}";
|
||||
};
|
||||
|
||||
"admin.cyperpunk.de" = {
|
||||
listen = [
|
||||
{
|
||||
addr = "0.0.0.0";
|
||||
port = 8011;
|
||||
}
|
||||
];
|
||||
root = "${synapseAdmin}";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,15 +1,35 @@
|
||||
{ config, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
serverIP = builtins.head (
|
||||
builtins.match "([0-9.]+)/.*" config.systemd.network.networks."10-ethernet".networkConfig.Address
|
||||
);
|
||||
|
||||
nodePort = toString config.services.prometheus.exporters.node.port;
|
||||
|
||||
mkNodeJob = name: ip: {
|
||||
job_name = name;
|
||||
static_configs = [ { targets = [ "${ip}:${nodePort}" ]; } ];
|
||||
};
|
||||
|
||||
extraNodes = {
|
||||
"cyper-desktop" = "192.168.2.40";
|
||||
"cyper-node-1" = "192.168.2.30";
|
||||
"cyper-node-2" = "192.168.2.31";
|
||||
};
|
||||
in
|
||||
{
|
||||
sops.secrets.grafana_secret_key = {
|
||||
sops.secrets = {
|
||||
grafana_secret_key = {
|
||||
owner = "grafana";
|
||||
group = "grafana";
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
services = {
|
||||
grafana = {
|
||||
enable = true;
|
||||
@@ -55,24 +75,11 @@ in
|
||||
prometheus = {
|
||||
enable = true;
|
||||
port = 9001;
|
||||
|
||||
scrapeConfigs = [
|
||||
{
|
||||
job_name = config.networking.hostName;
|
||||
static_configs = [
|
||||
{
|
||||
targets = [ "${serverIP}:${toString config.services.prometheus.exporters.node.port}" ];
|
||||
}
|
||||
];
|
||||
}
|
||||
{
|
||||
job_name = "cyper-desktop";
|
||||
static_configs = [
|
||||
{
|
||||
targets = [ "192.168.2.40:${toString config.services.prometheus.exporters.node.port}" ];
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
(mkNodeJob config.networking.hostName serverIP)
|
||||
]
|
||||
++ (lib.mapAttrsToList mkNodeJob extraNodes);
|
||||
};
|
||||
|
||||
loki = {
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
GROQ_API_KEY: ENC[AES256_GCM,data:OyuC4jfw67sCDa0XBGr78S6pzPV1ruy7KiIqPMgWWcOCVm3Y/khXEYPMjUTGrq9YLOw1MLso0OE=,iv:0y9klMYVtGsqAaLc2JidjZYSLhhbcbWbnBf8sZiC3rM=,tag:r6G2pzZn2d9JIaS+ozKnmg==,type:str]
|
||||
OPENWEATHER_API_KEY: ENC[AES256_GCM,data:bcuLz70u40nZfNgPTaeNRXdR/zjx0SQjwMbMNNFqROI=,iv:VCzse1a1/k1ZDIpFPL1QhjuS6YaDyohWi61JZaoc0Ws=,tag:UJSNyniNNLfGGRY/uiJcRA==,type:str]
|
||||
smb_passwd: ENC[AES256_GCM,data:+9RYomcnCZSME5DzuJWTLbS3IGJHhIYWZ5SmsgOn6YQ=,iv:VRPVR7DD+swjeUZKe54XYm3wn/KB4RqvQAyYXQbS+A8=,tag:NnA89efo6HVL0scHgyTZMQ==,type:str]
|
||||
grafana_secret_key: ENC[AES256_GCM,data:d6tu4kL7flfbdeOYk21zkSRmVe+NvVwd14jgr9Ds0adfgYetN852G25Z8/g=,iv:uWuwGBZVK1syhEfO9nLZUWwa801759tNJx+Pmnz3xeg=,tag:X6/NcdGZHAdIlOwxNPo/Ew==,type:str]
|
||||
matrix_macaroon_secret: ENC[AES256_GCM,data:a9nMar+p+FXIsxxSqO/to2OJOvD1erfwLwwBeKOcWBu7xykHxqD+pCmrGhg=,iv:rp4ZDVIlZ7SN1RFHB2CfSV5ISPMl9pC4U8Jgqpz48Qs=,tag:LxmWUZE3mG4acagQmlieag==,type:str]
|
||||
matrix_registration_secret: ENC[AES256_GCM,data:KhKkJZqwE8xk4/tuQ7NYTv/Ot1qCAiy8yUbDyVvRa0H5BT4amCBIdATfR4Q=,iv:HBN+GorT1VpWCVkDugk4UxYLEYKJIoDZh2d+oUDLc8g=,tag:hHus458yVnH0qaQ4u37IZg==,type:str]
|
||||
@@ -25,7 +26,7 @@ sops:
|
||||
N3I5dzUwc3JtYzczMUhyT04vSHlZamMKT+FzYcDLmlEFYxm/XoBpJb8XaZzBH1v9
|
||||
6fuez+zApathZfl14w41kAUojPWBznnxDqYtNvzVVLXwnpp3BMx+7w==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
lastmodified: "2026-04-14T14:21:09Z"
|
||||
mac: ENC[AES256_GCM,data:+h/eJT7L80PLXN9rFf0wBz5P1rbIptv+BVj1Q0sbILRodOEfO59ztXoHmlQWeO44FdGTE3ID1/WGBDBxqBn4/QuzEWe4ToaMWlpsBCmCBlpG5zNeO7cLk7s178z6Jm+2ZIyNdoZ0x/LU2urpdUMYFQnNr5B5oZJfNxPpHwRpeew=,iv:PMiGyuVmHhKHGcxAN99GwM5OTv8FLAXPTZEjJJdg/FM=,tag:uavEchiQnwejxV2jTfZ6hw==,type:str]
|
||||
lastmodified: "2026-04-16T13:04:38Z"
|
||||
mac: ENC[AES256_GCM,data:sH+C+rc+lRMCj6pY2grYYUK5/AVG6r2G4CEI9Z4MLWljyGKGL2tYYJw8YEhE9E4fw4h4UsyDphZOq2ebujBeAMLS5VH1kzzYUb45hAtx0+nhL5ASojf8VXyMCjyYieHj8bxsVBBi2D6t9oGOKYlav5d8ltZecf+G8yImDNGRw3I=,iv:uL2XyAYX50AVsA+lqdJKzAd8BgwlC+noZT1tzFd7Y/4=,tag:Tj0vCyUGrXtAQZw2KOv09Q==,type:str]
|
||||
unencrypted_suffix: _unencrypted
|
||||
version: 3.12.2
|
||||
|
||||
Reference in New Issue
Block a user