root/the_prg_server_configuration
1
0
Fork 0
mirror of https://codeberg.org/polyteknisk-radiogruppe/the_prg_server_configuration.git synced 2026-10-21 03:15:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: root:7fdee70ceccc6a1f02178e96623d57e259fe41a0
Branches Tags
root:main
..
compare: root:7bbacc8512b8aec4b7d505145fa5da50cc5706a6
Branches Tags
root:main

No commits in common. "7fdee70ceccc6a1f02178e96623d57e259fe41a0" and "7bbacc8512b8aec4b7d505145fa5da50cc5706a6" have entirely different histories.
7fdee70cec ... 7bbacc8512

6 changed files with 3 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

1
nix-system-configs/modules/system/build_machine.nix
View file

@ -42,7 +42,6 @@ in {
(choose [./modules/local/hostname_username.nix ../local/hostname_username.nix])
(choose [./modules/local/networking_local.nix ../local/networking_local.nix])
(choose [./modules/lix-default.nix ../lix-default.nix])
(choose [./modules/toolsets/grafana_metric.nix ../toolsets/grafana_metric.nix])
(choose [./modules/secrets-config/sops-build-machine.nix ../secrets-config/sops-build-machine.nix])
## TODO: Make this more elegant and less risky for unexpected errors happening.
]

1
nix-system-configs/modules/system/compose-songsheet.nix
View file

@ -38,7 +38,6 @@ in {
# Optionally: (choose [ ./modules/toolsets/remote_building.nix ../toolsets/remote_building.nix ])
## Compose modules for Portainer service
(choose [./modules/toolsets/grafana_metric.nix ../toolsets/grafana_metric.nix])
(choose [./modules/songsheet/wavelog/docker-compose.nix ../songsheet/wavelog/docker-compose.nix])
(choose [./modules/secrets-config/sops-composesongsheet.nix ../secrets-config/sops-composesongsheet.nix])
];

3
nix-system-configs/modules/system/database.nix
View file

@ -34,9 +34,8 @@ in {
(choose [./modules/desktop-manager/gnome.nix ../desktop-manager/gnome.nix])
(choose [./modules/local/hostname_username.nix ../local/hostname_username.nix])
(choose [./modules/local/networking_local.nix ../local/networking_local.nix])
# (choose [./modules/bootloader/seabios-assigned-iso-at-birth.nix ../bootloader/seabios-assigned-iso-at-birth.nix])
(choose [./modules/bootloader/seabios-assigned-iso-at-birth.nix ../bootloader/seabios-assigned-iso-at-birth.nix])
(choose [./modules/lix-default.nix ../lix-default.nix])
(choose [./modules/toolsets/grafana_metric.nix ../toolsets/grafana_metric.nix])
(choose [./modules/secrets-config/sops-database.nix ../secrets-config/sops-database.nix])
(choose [./modules/system_scripts/gcloud_backup.nix ../system_scripts/gcloud_backup.nix])
## TODO: Make this more elegant and less risky for unexpected errors happening.

1
nix-system-configs/modules/system/forgejo.nix
View file

@ -63,7 +63,6 @@ in {
(choose [./modules/toolsets/remote_building.nix ../toolsets/remote_building.nix])
(choose [./modules/bootloader/seabios-assigned-proxmox-at-birth.nix ../bootloader/seabios-assigned-proxmox-at-birth.nix])
(choose [./modules/lix-default.nix ../lix-default.nix])
(choose [./modules/toolsets/grafana_metric.nix ../toolsets/grafana_metric.nix])
];
config = {

58
nix-system-configs/modules/system/gramethus.nix
View file

@ -76,62 +76,6 @@ in {
# Prevents Grafana from phoning home
#analytics.reporting_enabled = false;
};
provision = {
enable = true;
# ============== Declarative Config ================
datasources.settings.datasources = [
# Provisioning a built-in data source
{
name = "Prometheus - Forgejo";
type = "prometheus";
url = "http://10.1.1.4:9001";
isDefault = false;
editable = true;
}
{
name = "Loki - Forgejo";
type = "loki";
url = "http://10.1.1.4:3100";
isDefault = false;
editable = true;
}
{
name = "Prometheus - Build Machine";
type = "prometheus";
url = "http://10.1.1.3:9001";
isDefault = false;
editable = true;
}
{
name = "Loki - Build Machine";
type = "loki";
url = "http://10.1.1.3:3100";
isDefault = false;
editable = true;
}
{
name = "Prometheus - Database";
type = "prometheus";
url = "http://10.1.1.251:9001";
isDefault = false;
editable = true;
}
{
name = "Loki - Database";
type = "loki";
url = "http://10.1.1.251:3100";
isDefault = false;
editable = true;
}
];
};
};
services.prometheus = {
@ -273,5 +217,7 @@ in {
networking.firewall.allowedTCPPorts = [3000];
networking.firewall.allowedUDPPorts = [3000];
# ============== Declarative Config ================
};
}

12
nix-system-configs/modules/toolsets/grafana_metric.nix
View file

@ -136,16 +136,4 @@
networking.firewall.allowedTCPPorts = [3100 9001];
networking.firewall.allowedUDPPorts = [3100 9001];
systemd.services."loki-create-dirs" = {
description = "Create Loki runtime/storage directories";
after = ["network.target"];
serviceConfig = {
Type = "oneshot";
ExecStart = '' ${pkgs.bash}/bin/bash -c "set -eu; \
mkdir -p /var/loki /var/loki/compactor
'';
};
wantedBy = ["multi-user.target"];
};
}