From 1d1eb043d19a9f1b0c8e8faebede7842a45dabf5 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 22 Mar 2023 23:57:07 +0100
Subject: ma gum.r: enable ipv6 again

---
 makefu/1systems/gum/config.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'makefu/1systems/gum/config.nix')

diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix
index 26bfd0731..e61af7a7b 100644
--- a/makefu/1systems/gum/config.nix
+++ b/makefu/1systems/gum/config.nix
@@ -103,6 +103,7 @@ in {
       # <stockholm/makefu/2configs/sabnzbd.nix>
       # <stockholm/makefu/2configs/mail/mail.euer.nix>
       { krebs.exim.enable = mkDefault true; }
+      <stockholm/makefu/2configs/nix-community/mediawiki-matrix-bot.nix>
 
       # sharing
       <stockholm/makefu/2configs/share/gum.nix> # samba sahre
@@ -125,7 +126,7 @@ in {
       <stockholm/makefu/2configs/backup/server.nix>
       <stockholm/makefu/2configs/backup/state.nix>
       <stockholm/makefu/2configs/wireguard/server.nix>
-      # <stockholm/makefu/2configs/wireguard/wiregrill.nix>
+      <stockholm/makefu/2configs/wireguard/wiregrill.nix>
 
       { # recent changes mediawiki bot
         networking.firewall.allowedUDPPorts = [ 5005 5006 ];
@@ -173,7 +174,7 @@ in {
       # <stockholm/makefu/2configs/nginx/iso.euer.nix>
 
       # <stockholm/makefu/2configs/deployment/photostore.krebsco.de.nix>
-      <stockholm/makefu/2configs/deployment/graphs.nix>
+      # <stockholm/makefu/2configs/deployment/graphs.nix>
       #<stockholm/makefu/2configs/deployment/owncloud.nix>
       # <stockholm/makefu/2configs/deployment/board.euer.krebsco.de.nix>
       #<stockholm/makefu/2configs/deployment/feed.euer.krebsco.de>
-- 
cgit v1.2.3


From ad0c3323172a0b6562f0545c0da42214d3178da9 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 3 Jun 2023 15:40:54 +0200
Subject: ma gum.r: apply all deployment changes

---
 makefu/1systems/gum/config.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'makefu/1systems/gum/config.nix')

diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix
index e61af7a7b..f40f113bb 100644
--- a/makefu/1systems/gum/config.nix
+++ b/makefu/1systems/gum/config.nix
@@ -9,6 +9,12 @@ in {
   imports = [
       <stockholm/makefu>
       ./hetznercloud
+      {
+        # wait for mount
+        systemd.services.rtorrent.wantedBy = lib.mkForce [];
+        systemd.services.phpfpm-nextcloud.wantedBy = lib.mkForce [];
+        systemd.services.samba-smbd.wantedBy = lib.mkForce [];
+      }
       {
         users.users.lass = {
           uid = 19002;
@@ -140,6 +146,7 @@ in {
       <stockholm/makefu/2configs/deployment/rss/rss.euer.krebsco.de.nix> # postgres backend
       <stockholm/makefu/2configs/deployment/rss/ratt.nix>
 
+      <stockholm/makefu/2configs/deployment/ntfysh.nix>
       <stockholm/makefu/2configs/deployment/owncloud.nix> #postgres backend
       ### Moving owncloud data dir to /media/cloud/nextcloud-data
       {
@@ -185,7 +192,7 @@ in {
       <stockholm/makefu/2configs/bgt/etherpad.euer.krebsco.de.nix>
       # <stockholm/makefu/2configs/deployment/systemdultras-rss.nix>
 
-      # <stockholm/makefu/2configs/shiori.nix>
+      <stockholm/makefu/2configs/shiori.nix>
       #<stockholm/makefu/2configs/workadventure>
 
       <stockholm/makefu/2configs/bgt/download.binaergewitter.de.nix>
-- 
cgit v1.2.3

[cgit] Unable to lock slot /tmp/cgit/f2200000.lock: No such file or directory (2)