summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2019-10-14 16:02:12 +0200
committerlassulus <lassulus@lassul.us>2019-10-14 16:02:12 +0200
commit7f7ce8077e4fa6fa023c63c4d1444576179859c3 (patch)
tree12e48733a1b1dbbcd3dc9d9aa72dba0393b666e7 /krebs
parent539f4f09fc31552f58b0d32eec2a7b22000d3939 (diff)
parent8273bcc77c83307faec8963a48758cd51ad044ac (diff)
Merge remote-tracking branch 'gum/19.09' into 19.09
Diffstat (limited to 'krebs')
-rw-r--r--krebs/1systems/puyak/config.nix2
-rw-r--r--krebs/1systems/wolf/config.nix4
-rw-r--r--krebs/2configs/shack/glados/multi/wasser.nix2
-rw-r--r--krebs/2configs/shack/mqtt_sub.nix2
-rw-r--r--krebs/2configs/shack/muell_caller.nix3
-rw-r--r--krebs/2configs/shack/muell_mail.nix3
-rw-r--r--krebs/2configs/shack/muellshack.nix3
-rw-r--r--krebs/2configs/shack/node-light.nix3
-rw-r--r--krebs/2configs/shack/powerraw.nix6
-rw-r--r--krebs/2configs/shack/radioactive.nix3
-rw-r--r--krebs/3modules/makefu/default.nix2
-rw-r--r--krebs/nixpkgs.json6
12 files changed, 25 insertions, 14 deletions
diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix
index 6321b6cc4..6493c6df4 100644
--- a/krebs/1systems/puyak/config.nix
+++ b/krebs/1systems/puyak/config.nix
@@ -14,6 +14,8 @@
<stockholm/krebs/2configs/news.nix>
<stockholm/krebs/2configs/news-spam.nix>
<stockholm/krebs/2configs/shack/prometheus/node.nix>
+ <stockholm/krebs/2configs/shack/prometheus/server.nix>
+ <stockholm/krebs/2configs/shack/prometheus/unifi.nix>
<stockholm/krebs/2configs/shack/gitlab-runner.nix>
## Collect local statistics via collectd and send to collectd
diff --git a/krebs/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix
index 6e53637e6..e47c43fe1 100644
--- a/krebs/1systems/wolf/config.nix
+++ b/krebs/1systems/wolf/config.nix
@@ -62,9 +62,9 @@ in
<stockholm/krebs/2configs/shack/netbox.nix>
# prometheus.shack
- <stockholm/krebs/2configs/shack/prometheus/server.nix>
+ #<stockholm/krebs/2configs/shack/prometheus/server.nix>
<stockholm/krebs/2configs/shack/prometheus/node.nix>
- <stockholm/krebs/2configs/shack/prometheus/unifi.nix>
+ #<stockholm/krebs/2configs/shack/prometheus/unifi.nix>
# grafana.shack
<stockholm/krebs/2configs/shack/grafana.nix>
diff --git a/krebs/2configs/shack/glados/multi/wasser.nix b/krebs/2configs/shack/glados/multi/wasser.nix
index da5cac36d..578bb0750 100644
--- a/krebs/2configs/shack/glados/multi/wasser.nix
+++ b/krebs/2configs/shack/glados/multi/wasser.nix
@@ -12,7 +12,7 @@ let
retain = false;
qos = 1;
};
- seconds = 30;
+ seconds = 20;
in
{
switch = [
diff --git a/krebs/2configs/shack/mqtt_sub.nix b/krebs/2configs/shack/mqtt_sub.nix
index a8427dde4..bd0b6df85 100644
--- a/krebs/2configs/shack/mqtt_sub.nix
+++ b/krebs/2configs/shack/mqtt_sub.nix
@@ -29,6 +29,8 @@ in {
User = "nobody";
ExecStart = "${pkg}/bin/sub-new";
PrivateTmp = true;
+ Restart = "always";
+ RestartSec = "15";
};
};
}
diff --git a/krebs/2configs/shack/muell_caller.nix b/krebs/2configs/shack/muell_caller.nix
index 19768cb2e..33f6b8c89 100644
--- a/krebs/2configs/shack/muell_caller.nix
+++ b/krebs/2configs/shack/muell_caller.nix
@@ -33,9 +33,10 @@ in {
chown nobody /tmp/tell.json
'';
ExecStart = "${pkg}/bin/call-muell --cfg /tmp/tell.json --mode mpd loop 60";
- Restart = "always";
PrivateTmp = true;
PermissionsStartOnly = true;
+ Restart = "always";
+ RestartSec = "15";
};
};
}
diff --git a/krebs/2configs/shack/muell_mail.nix b/krebs/2configs/shack/muell_mail.nix
index 39d49918d..a41dbc977 100644
--- a/krebs/2configs/shack/muell_mail.nix
+++ b/krebs/2configs/shack/muell_mail.nix
@@ -26,8 +26,9 @@ in {
WorkingDirectory = home;
PermissionsStartOnly = true;
ExecStart = "${pkg}/bin/muell_mail";
- Restart = "always";
PrivateTmp = true;
+ Restart = "always";
+ RestartSec = "15";
};
};
}
diff --git a/krebs/2configs/shack/muellshack.nix b/krebs/2configs/shack/muellshack.nix
index 1e6843bdf..9168c9ba7 100644
--- a/krebs/2configs/shack/muellshack.nix
+++ b/krebs/2configs/shack/muellshack.nix
@@ -36,8 +36,9 @@ in {
'';
WorkingDirectory = home;
ExecStart = "${pkg}/bin/muellshack";
- Restart = "always";
PrivateTmp = true;
+ Restart = "always";
+ RestartSec = "15";
};
};
}
diff --git a/krebs/2configs/shack/node-light.nix b/krebs/2configs/shack/node-light.nix
index 63772f182..8cf0007b8 100644
--- a/krebs/2configs/shack/node-light.nix
+++ b/krebs/2configs/shack/node-light.nix
@@ -46,8 +46,9 @@ in {
'';
WorkingDirectory = home;
ExecStart = "${pkg}/bin/node-light";
- Restart = "always";
PrivateTmp = true;
+ Restart = "always";
+ RestartSec = "15";
};
};
}
diff --git a/krebs/2configs/shack/powerraw.nix b/krebs/2configs/shack/powerraw.nix
index af3f129c1..4118e7a72 100644
--- a/krebs/2configs/shack/powerraw.nix
+++ b/krebs/2configs/shack/powerraw.nix
@@ -22,8 +22,9 @@ in {
serviceConfig = {
User = "powermeter";
ExecStart = "${pkg}/bin/powermeter-serial2mqtt";
- Restart = "always";
PrivateTmp = true;
+ Restart = "always";
+ RestartSec = "15";
};
};
@@ -33,8 +34,9 @@ in {
serviceConfig = {
User = "powermeter";
ExecStart = "${pkg}/bin/powermeter-mqtt2socket";
- Restart = "always";
PrivateTmp = true;
+ Restart = "always";
+ RestartSec = "15";
};
};
diff --git a/krebs/2configs/shack/radioactive.nix b/krebs/2configs/shack/radioactive.nix
index 566146d6e..286a73aae 100644
--- a/krebs/2configs/shack/radioactive.nix
+++ b/krebs/2configs/shack/radioactive.nix
@@ -27,9 +27,10 @@ in {
serviceConfig = {
User = "nobody"; # TODO separate user
ExecStart = "${pkg}/bin/radioactive-add-many loop 60";
- Restart = "always";
PrivateTmp = true;
PermissionsStartOnly = true;
+ Restart = "always";
+ RestartSec = "15";
};
};
}
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix
index ab24d9096..f9e8d485c 100644
--- a/krebs/3modules/makefu/default.nix
+++ b/krebs/3modules/makefu/default.nix
@@ -184,7 +184,7 @@ in {
nixos.unstable IN CNAME krebscode.github.io.
o.euer IN A ${nets.internet.ip4.addr}
photostore IN A ${nets.internet.ip4.addr}
- pigstarter IN A ${nets.internet.ip4.addr}
+ pigstarter IN CNAME makefu.github.io.
share.euer IN A ${nets.internet.ip4.addr}
wg.euer IN A ${nets.internet.ip4.addr}
wiki.euer IN A ${nets.internet.ip4.addr}
diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json
index b43fb07fc..01230b439 100644
--- a/krebs/nixpkgs.json
+++ b/krebs/nixpkgs.json
@@ -1,7 +1,7 @@
{
"url": "https://github.com/NixOS/nixpkgs-channels",
- "rev": "88bbb3c809699f44bf844094a2cd7874e0ea4a39",
- "date": "2019-10-09T11:39:27+02:00",
- "sha256": "0vqwws2hhsx1g4kdhm2sz9m71n0jvjvhgv9ia7fjz679s3341032",
+ "rev": "7952807791daf3c60c99f10f371f732d897e3de8",
+ "date": "2019-10-13T01:14:01+02:00",
+ "sha256": "1h9wg0arazbyj8xfgvfhzn2gw6ya8sgcxscy1n5j182b5xri1xdk",
"fetchSubmodules": false
}