From e6884999a9a002c20ab854aa14c428792ab72b21 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 31 Aug 2021 21:35:23 +0200
Subject: ma pkgs.mediawiki-matrix-bot: init at 1.0.0

---
 makefu/5pkgs/mediawiki-matrix-bot/default.nix | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 makefu/5pkgs/mediawiki-matrix-bot/default.nix

diff --git a/makefu/5pkgs/mediawiki-matrix-bot/default.nix b/makefu/5pkgs/mediawiki-matrix-bot/default.nix
new file mode 100644
index 000000000..4a91a9161
--- /dev/null
+++ b/makefu/5pkgs/mediawiki-matrix-bot/default.nix
@@ -0,0 +1,22 @@
+{ buildPythonApplication,  fetchFromGitHub, feedparser, matrix-nio, docopt, aiohttp, aiofiles,
+mypy }:
+
+buildPythonApplication rec {
+  pname = "mediawiki-matrix-bot";
+  version = "1.0.0";
+  src = fetchFromGitHub {
+    owner = "nix-community";
+    repo = "mediawiki-matrix-bot";
+    rev = "v${version}";
+    sha256 = "1923097j1xh34jmm0zhmvma614jcxaagj89c1fc1j2qyv14ybsvs";
+  };
+  propagatedBuildInputs = [
+    feedparser matrix-nio docopt aiohttp aiofiles
+  ];
+  nativeBuildInputs = [
+    mypy
+  ];
+  checkPhase = ''
+    mypy --strict mediawiki_matrix_bot
+  '';
+}
-- 
cgit v1.2.3


From 5c570ab3fc90ca689a9f01c0bffd2470130738ba Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 1 Sep 2021 13:35:05 +0200
Subject: ma nix-community: add mediawiki-matrix-bot

---
 makefu/1systems/gum/config.nix                     |  3 ++-
 .../nix-community/mediawiki-matrix-bot.nix         | 23 ++++++++++++++++++++++
 .../5pkgs/custom/mediawiki-matrix-bot/default.nix  | 22 +++++++++++++++++++++
 makefu/5pkgs/mediawiki-matrix-bot/default.nix      | 22 ---------------------
 4 files changed, 47 insertions(+), 23 deletions(-)
 create mode 100644 makefu/2configs/nix-community/mediawiki-matrix-bot.nix
 create mode 100644 makefu/5pkgs/custom/mediawiki-matrix-bot/default.nix
 delete mode 100644 makefu/5pkgs/mediawiki-matrix-bot/default.nix

diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix
index 1cfa8e4a4..adf025fd3 100644
--- a/makefu/1systems/gum/config.nix
+++ b/makefu/1systems/gum/config.nix
@@ -23,6 +23,7 @@ in {
       }
       <stockholm/makefu/2configs/nur.nix>
       <stockholm/makefu/2configs/support-nixos.nix>
+      <stockholm/makefu/2configs/nix-community/mediawiki-matrix-bot.nix>
       <stockholm/makefu/2configs/home-manager>
       <stockholm/makefu/2configs/home-manager/cli.nix>
       # <stockholm/makefu/2configs/stats/client.nix>
@@ -182,7 +183,7 @@ in {
       <stockholm/makefu/2configs/virtualisation/libvirt.nix>
 
       # krebs infrastructure services
-      <stockholm/makefu/2configs/stats/server.nix>
+      # <stockholm/makefu/2configs/stats/server.nix>
     ];
 
   makefu.dl-dir = "/var/download";
diff --git a/makefu/2configs/nix-community/mediawiki-matrix-bot.nix b/makefu/2configs/nix-community/mediawiki-matrix-bot.nix
new file mode 100644
index 000000000..6dff64121
--- /dev/null
+++ b/makefu/2configs/nix-community/mediawiki-matrix-bot.nix
@@ -0,0 +1,23 @@
+{ pkgs, ... }:
+let
+  seccfg = toString <secrets/mediawikibot-config.json>;
+  statecfg = "/var/lib/mediawiki-matrix-bot/config.json";
+in {
+  systemd.services.mediawiki-matrix-bot = {
+    description = "Mediawiki Matrix Bot";
+    after = [ "network-online.target" ];
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig = {
+      Restart = "always";
+      RestartSec = "60s";
+      DynamicUser = true;
+      StateDirectory = "mediawiki-matrix-bot";
+      PermissionsStartOnly = true;
+      ExecStartPre = pkgs.writeDash "mediawikibot-copy-config" ''
+        install -D  -m644 ${seccfg} ${statecfg}
+      '';
+      ExecStart = "${pkgs.mediawiki-matrix-bot}/bin/mediawiki-matrix-bot ${statecfg}";
+      PrivateTmp = true;
+    };
+  };
+}
diff --git a/makefu/5pkgs/custom/mediawiki-matrix-bot/default.nix b/makefu/5pkgs/custom/mediawiki-matrix-bot/default.nix
new file mode 100644
index 000000000..4a91a9161
--- /dev/null
+++ b/makefu/5pkgs/custom/mediawiki-matrix-bot/default.nix
@@ -0,0 +1,22 @@
+{ buildPythonApplication,  fetchFromGitHub, feedparser, matrix-nio, docopt, aiohttp, aiofiles,
+mypy }:
+
+buildPythonApplication rec {
+  pname = "mediawiki-matrix-bot";
+  version = "1.0.0";
+  src = fetchFromGitHub {
+    owner = "nix-community";
+    repo = "mediawiki-matrix-bot";
+    rev = "v${version}";
+    sha256 = "1923097j1xh34jmm0zhmvma614jcxaagj89c1fc1j2qyv14ybsvs";
+  };
+  propagatedBuildInputs = [
+    feedparser matrix-nio docopt aiohttp aiofiles
+  ];
+  nativeBuildInputs = [
+    mypy
+  ];
+  checkPhase = ''
+    mypy --strict mediawiki_matrix_bot
+  '';
+}
diff --git a/makefu/5pkgs/mediawiki-matrix-bot/default.nix b/makefu/5pkgs/mediawiki-matrix-bot/default.nix
deleted file mode 100644
index 4a91a9161..000000000
--- a/makefu/5pkgs/mediawiki-matrix-bot/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ buildPythonApplication,  fetchFromGitHub, feedparser, matrix-nio, docopt, aiohttp, aiofiles,
-mypy }:
-
-buildPythonApplication rec {
-  pname = "mediawiki-matrix-bot";
-  version = "1.0.0";
-  src = fetchFromGitHub {
-    owner = "nix-community";
-    repo = "mediawiki-matrix-bot";
-    rev = "v${version}";
-    sha256 = "1923097j1xh34jmm0zhmvma614jcxaagj89c1fc1j2qyv14ybsvs";
-  };
-  propagatedBuildInputs = [
-    feedparser matrix-nio docopt aiohttp aiofiles
-  ];
-  nativeBuildInputs = [
-    mypy
-  ];
-  checkPhase = ''
-    mypy --strict mediawiki_matrix_bot
-  '';
-}
-- 
cgit v1.2.3


From ee66b2f02d455060267f8f59c1fea97b8310668d Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 5 Sep 2021 18:23:38 +0200
Subject: ma pkgs/dev: add cyberlocker

---
 makefu/2configs/tools/dev.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix
index ac6d91e85..36f867559 100644
--- a/makefu/2configs/tools/dev.nix
+++ b/makefu/2configs/tools/dev.nix
@@ -33,6 +33,7 @@
     cac-api
     cac-panel
     krebszones
+    cyberlocker-tools
     ovh-zone
     gen-oath-safe
     cdrtools
-- 
cgit v1.2.3