@cryptotaxi247 / infra-1 / commits / 3c3d0c1d

go-neb: use channel version

Graham Christensen committed Dec 18, 2021 at 22:04 UTC 3c3d0c1d099be4d0221bc94e7af12fbf31a29368
2 files changed +1 -52
delft/eris/alertmanager-matrix-forwarder.nix
+1 -25
@@ -1,34 +1,10 @@
1 { config, pkgs, ... }:
2 -let
3 - finalConfigFile = "/var/run/go-neb/config.yaml";
4 -
5 - settingsFormat = pkgs.formats.yaml {};
6 - configFile = settingsFormat.generate "config.yaml" config.services.go-neb.config;
7 -
8 - go-neb = pkgs.callPackage ./go-neb-backport.nix {};
9 -in {
2 +{
3 deployment.keys."alertmanager-matrix-forwarder" = {
4 keyFile = /home/deploy/src/nixos-org-configurations/keys/alertmanager-matrix-forwarder;
5 # user = config.systemd.services.go-neb.serviceConfig.User;
6 };
7
15 - systemd.services.go-neb = {
16 - serviceConfig = {
17 - ExecStartPre = pkgs.writeShellScript "pre-start" ''
18 - umask 077
19 - export $(xargs < /run/keys/alertmanager-matrix-forwarder)
20 - ${pkgs.envsubst}/bin/envsubst -i "${configFile}" > ${finalConfigFile}
21 - chown go-neb ${finalConfigFile}
22 - '';
23 - ExecStart = pkgs.lib.mkForce "${go-neb}/bin/go-neb";
24 - User = "go-neb";
25 - SupplementaryGroups = [ "keys" ];
26 - RuntimeDirectory = "go-neb";
27 - PermissionsStartOnly = true;
28 - };
29 - environment.CONFIG_FILE = pkgs.lib.mkForce finalConfigFile;
30 - };
31 -
8 services.go-neb = {
9 enable = true;
10 baseUrl = "http://localhost";
delft/eris/go-neb-backport.nix deleted
-27
@@ -1,27 +0,0 @@
1 -{ lib, buildGoModule, fetchFromGitHub, olm }:
2 -
3 -buildGoModule {
4 - pname = "go-neb";
5 - version = "unstable-2021-07-21";
6 - src = fetchFromGitHub {
7 - owner = "matrix-org";
8 - repo = "go-neb";
9 - rev = "8916c80f8ce1732f64b50f9251242ca189082e76";
10 - sha256 = "sha256-kuH4vbvS4G1bczxUdY4bd4oL4pIZzuueUxdEp4xuzJM=";
11 - };
12 -
13 - subPackages = [ "." ];
14 -
15 - buildInputs = [ olm ];
16 -
17 - vendorSha256 = "sha256-5Vg7aUkqiFIQuxmsDOJjvXoeA5NjMoBoD0XBhC+o4GA=";
18 -
19 - doCheck = false;
20 -
21 - meta = with lib; {
22 - description = "Extensible matrix bot written in Go";
23 - homepage = "https://github.com/matrix-org/go-neb";
24 - license = licenses.asl20;
25 - maintainers = with maintainers; [ hexa maralorn ];
26 - };
27 -}