mirror of https://gerrit.hackerspace.pl/hscloud
hswaw/machines/customs: unpin hscloud/nixpkgs in certain modules
Change-Id: I1c02a485b76955e3de3859fca4d6c7e8e69ef09b Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1170 Reviewed-by: informatic <informatic@hackerspace.pl>changes/70/1170/5
parent
b6bc3e69b9
commit
6f6187c61c
|
@ -1,13 +1,6 @@
|
||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
# hscloud checkout, hscloud.routing used to set up dynamic routing (OSPFv6 via bird)
|
|
||||||
hscloud = fetchGit {
|
|
||||||
url = "https://gerrit.hackerspace.pl/hscloud.git";
|
|
||||||
name = "hscloud";
|
|
||||||
rev = "e401735fdd241b25dac4cb82d828dcfa6f84b198";
|
|
||||||
};
|
|
||||||
|
|
||||||
hw = builtins.fromJSON (builtins.readFile ./hw.json);
|
hw = builtins.fromJSON (builtins.readFile ./hw.json);
|
||||||
fw = import ./fw-7535.nix;
|
fw = import ./fw-7535.nix;
|
||||||
vuko-pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFhaCaC/CVYv6hphqmEdKaPrIn+Q946+myvL9SSnzFZk vuko@eagle";
|
vuko-pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFhaCaC/CVYv6hphqmEdKaPrIn+Q946+myvL9SSnzFZk vuko@eagle";
|
||||||
|
@ -52,7 +45,7 @@ in {
|
||||||
#./hardware-configuration.nix
|
#./hardware-configuration.nix
|
||||||
<nixpkgs/nixos/modules/profiles/minimal.nix>
|
<nixpkgs/nixos/modules/profiles/minimal.nix>
|
||||||
<nixpkgs/nixos/modules/profiles/all-hardware.nix>
|
<nixpkgs/nixos/modules/profiles/all-hardware.nix>
|
||||||
"${hscloud}/bgpwtf/machines/modules/routing.nix"
|
../../../bgpwtf/machines/modules/routing.nix
|
||||||
./checkinator-tracker.nix
|
./checkinator-tracker.nix
|
||||||
./checkinator-web.nix
|
./checkinator-web.nix
|
||||||
./mikrotik-exporter.nix
|
./mikrotik-exporter.nix
|
||||||
|
|
|
@ -1,11 +1,6 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
unstable = import (fetchTarball {
|
|
||||||
sha256 = "0ww70kl08rpcsxb9xdx8m48vz41dpss4hh3vvsmswll35l158x0v";
|
|
||||||
url = "https://api.github.com/repos/NixOS/nixpkgs-channels/tarball/84d74ae9c9cbed73274b8e4e00be14688ffc93fe";
|
|
||||||
}) {config = pkgs.config; };
|
|
||||||
|
|
||||||
name = "mikrotik-exporter";
|
name = "mikrotik-exporter";
|
||||||
user = name;
|
user = name;
|
||||||
group = name;
|
group = name;
|
||||||
|
@ -28,6 +23,6 @@ in {
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
serviceConfig.Type = "simple";
|
serviceConfig.Type = "simple";
|
||||||
serviceConfig.ExecStartPre = [ "!${prepare-secrets}" ];
|
serviceConfig.ExecStartPre = [ "!${prepare-secrets}" ];
|
||||||
serviceConfig.ExecStart = "${unstable.prometheus-mikrotik-exporter}/bin/mikrotik-exporter -config-file /mnt/secrets/${name}/ap.yml -port 127.0.0.1:9436";
|
serviceConfig.ExecStart = "${pkgs.prometheus-mikrotik-exporter}/bin/mikrotik-exporter -config-file /mnt/secrets/${name}/ap.yml -port 127.0.0.1:9436";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue