clerie/nixfiles
1
0
Fork 0
Code

Update from updated-inputs-2024-11-21-02-03

Browse Source
This commit is contained in:
Flake Update Bot 2024-11-21 03:04:04 +01:00
commit a168a18199
9 changed files with 7 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configuration/common/nix.nix
View File

@ -26,7 +26,6 @@
experimental-features = [
"flakes"
"nix-command"
"repl-flake"
];
substituters = [
"https://nix-cache.clerie.de"
@ -63,6 +62,8 @@
};
};
nix.package = pkgs.nixVersions.nix_2_18;
documentation.doc.enable = false;
environment.systemPackages = with pkgs; [

6
flake.lock
View File

@ -288,11 +288,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1731676054,
"narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
"lastModified": 1732014248,
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
"rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
"type": "github"
},
"original": {

49
hosts/monitoring-3/prometheus.nix
View File

@ -230,15 +230,6 @@ in {
"achtbaan.nikhef.nl"
"www.fem.tu-ilmenau.de"
"www.heise.de"
"pe10-fd2.nodes.nethinks.com"
"pe20-fd2.nodes.nethinks.com"
"pe10-pet1.nodes.nethinks.com"
"pe20-pet1.nodes.nethinks.com"
"pe10-ffm1.nodes.nethinks.com"
"ie10-ffm2.nodes.nethinks.com"
"pe10-ffm2.nodes.nethinks.com"
"ie10-due1.nodes.nethinks.com"
"pe10-due1.nodes.nethinks.com"
"matrix.bau-ha.us"
"dyon.net.entr0py.de"
"matrix.entr0py.de"
@ -358,46 +349,6 @@ in {
relabelAddressToInstance
];
}
{
job_name = "zimmer-temp";
scrape_interval = "20s";
scheme = "https";
metrics_path = "/data/zimmer-temp/";
static_configs = [
{
targets = [
"iot-data.clerie.de"
];
}
];
}
{
job_name = "outdoor-temp";
scrape_interval = "20s";
scheme = "https";
metrics_path = "/data/outdoor-temp/";
static_configs = [
{
targets = [
"iot-data.clerie.de"
];
}
];
}
{
job_name = "xmpp-alerts";
scrape_interval = "20s";
static_configs = [
{
targets = [
"monitoring-3.mon.clerie.de:9199"
];
}
];
relabel_configs = [
relabelAddressToInstance
];
}
{
job_name = "hydra";
scrape_interval = "20s";

14
hosts/web-2/bubblesort.nix
View File

@ -1,14 +0,0 @@
{ pkgs, ... }:
{
services.nginx.virtualHosts = {
"bubblesort.clerie.de" = {
enableACME = true;
forceSSL = true;
root = pkgs.fetchgit {
url = "https://git.clerie.de/clerie/bubblesort_js.git";
rev = "39d54701a11f4fb48d7e023e384a848e6bde5640";
sha256 = "sha256-au/sbTVLDER0BbXD6cKJIpq0GcS/saiRQw46mZQWsO0=";
};
};
};
}

4
hosts/web-2/clerie.nix
View File

@ -15,8 +15,8 @@
forceSSL = true;
root = pkgs.fetchgit {
url = "https://git.clerie.de/clerie/clerie.de.git";
rev = "785693e6826c6377c3f3200274c281d2ef3317b3";
hash = "sha256-cyTHOOm7hpPUD8paKB7Wci3RYAo6Jr/MI/Xqx4iwXwY=";
rev = "ec744cbeaf99ae4fd4832d7e594bc72bfabc8706";
hash = "sha256-EG8UO/9ycyWjtqLUX7ydctLdIbq/j8zylEK7YYvEwmI=";
};
locations."/ssh" = {
extraConfig = ''

4
hosts/web-2/configuration.nix
View File

@ -5,27 +5,23 @@
[
./hardware-configuration.nix
./blog.nix
./bubblesort.nix
./bula22.nix
./chaosevents.nix
./clerie.nix
./drop.nix
./fieldpoc.nix
./gitea.nix
./iot-data.nix
./ip.nix
./legal.nix
./meow.nix
./milchinsel.nix
./mitel-ommclient2.nix
./nix-install.nix
./nogo2024.nix
./nurausstieg.nix
./ping.nix
./public.nix
./radicale.nix
./reichartstrasse.nix
./tap.nix
./uptimestatus.nix
./wetter.nix
];

40
hosts/web-2/iot-data.nix
View File

@ -1,40 +0,0 @@
{pkgs, ...}:
{
users.users.iot-data = {
description = "IOT Data Service";
group = "iot-data";
home = "/var/lib/iot-data/";
useDefaultShell = true;
isSystemUser = true;
};
users.groups.iot-data = {};
systemd.services.iot-data = {
wantedBy = [ "multi-user.target" ];
serviceConfig = {
RuntimeDirectory = "iot-data";
StateDirectory = "iot-data";
User = "iot-data";
Group = "iot-data";
};
environment = {
IOT_DATA_CONFIG = "/var/src/iot-data-config.json";
};
script = "gunicorn -w 1 -b [::1]:8235 iot_data:app";
path = with pkgs; [ (python3.withPackages (ps: [ ps.gunicorn iot-data ])) ];
};
services.nginx.virtualHosts = {
"iot-data.clerie.de" = {
enableACME = true;
addSSL = true;
locations."/" = {
proxyPass = "http://[::1]:8235";
};
extraConfig = ''
access_log off;
'';
};
};
}

20
hosts/web-2/nogo2024.nix
View File

@ -1,20 +0,0 @@
{ pkgs, ... }:
{
services.nginx.virtualHosts = {
"nogo2024.clerie.de" = {
enableACME = true;
forceSSL = true;
locations."/" = {
return = "404";
};
locations."= /nogo2024.ics" = {
root = pkgs.fetchgit {
url = "https://git.clerie.de/clerie/nogo2024.git";
rev = "fdc07667e6cfa09e91eaaee488528fb842a6115d";
sha256 = "sha256-qRviw0sQnMmrkwBO0+AWnmeqZK8wXeFxZJgmLMUtzn4=";
};
};
};
};
}

15
hosts/web-2/tap.nix
View File

@ -1,15 +0,0 @@
{ pkgs, ... }:
{
services.nginx.virtualHosts = {
"tap.clerie.de" = {
enableACME = true;
forceSSL = true;
root = pkgs.fetchgit {
url = "https://git.clerie.de/clerie/tap.clerie.de.git";
rev = "a90df6f6cb6dc58ab807b230527aae76c48cdcc8";
sha256 = "sha256-GTUy98NHXvR7pG8lUWZm6wa0XjULnDTSu17C/DQuXBI=";
};
};
};
}