From b0eb5e5fcd9c1a9d58aa7f4a7d0f98a77ebeb809 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Sun, 26 Jan 2020 14:20:20 +1300
Subject: [PATCH] graylog: use upstream geoip database

---
 configs/workhorse/graylog.nix |  5 +----
 pkgs/default.nix              |  2 --
 pkgs/geodatabase/default.nix  | 27 ---------------------------
 3 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 pkgs/geodatabase/default.nix

diff --git a/configs/workhorse/graylog.nix b/configs/workhorse/graylog.nix
index 63e5134..04fee7a 100644
--- a/configs/workhorse/graylog.nix
+++ b/configs/workhorse/graylog.nix
@@ -47,10 +47,7 @@ in {
   services.graylog.rootPasswordSha2 =
     lib.fileContents <secrets/graylog/root-password-hash>;
 
-  environment.etc."graylog/server/GeoLite2-City.mmdb" = {
-    enable = true;
-    source = "${pkgs.geodatabase}/GeoLite2-City.mmdb";
-  };
+  services.geoip-updater.enable = true;
 
   # https://wiki.splunk.com/Http_status.csv
   environment.etc."graylog/server/httpCodes.csv" = {
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 1382cd9..c19a200 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -29,8 +29,6 @@ in {
 
   bitwig-studio = callPackage ./bitwig-studio/bitwig-studio-environment.nix { };
 
-  geodatabase = callPackage ./geodatabase { };
-
   landingpage = callPackage ./landingpage { };
 
   bepasty-client-cli = callPackage ./bepasty-client-cli { };
diff --git a/pkgs/geodatabase/default.nix b/pkgs/geodatabase/default.nix
deleted file mode 100644
index 9887d3c..0000000
--- a/pkgs/geodatabase/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, ... }:
-
-stdenv.mkDerivation rec {
-  version = "20190702";
-  name = "geocities-${version}";
-  src = fetchurl {
-    url =
-      "https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz";
-    # sha256 = "10jc4sff6p0gx5lirpy1m683l42al4sdh44hqmvnznxdgpgfcy3r";
-    sha256 = "1r2v3np74hzkzzndi15kwhl65wfy6aflfnj85ars0236bh2d786c";
-  };
-
-  dontBuild = true;
-
-  installPhase = ''
-    mkdir -p $out/
-    cp GeoLite2-City.mmdb $out/
-  '';
-
-  meta = with stdenv.lib; {
-    description = "geo database";
-    homepage = "https://dev.maxmind.com/geoip/geoip2/geolite2/";
-    license = licenses.MIT;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ mrVanDalo ];
-  };
-}