2 files changed, 22 insertions, 8 deletions
diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix
index ff0c18795..26bfd0731 100644
--- a/makefu/1systems/gum/config.nix
+++ b/makefu/1systems/gum/config.nix
@@ -99,6 +99,7 @@ in {
       <stockholm/makefu/2configs/taskd.nix>
 
       # services
+      <stockholm/makefu/2configs/bitlbee.nix> # postgres backend
       # <stockholm/makefu/2configs/sabnzbd.nix>
       # <stockholm/makefu/2configs/mail/mail.euer.nix>
       { krebs.exim.enable = mkDefault true; }
@@ -144,14 +145,18 @@ in {
         users.users.nextcloud.extraGroups = [ "download" ];
         # nextcloud-setup fails as it cannot set permissions for nextcloud
         systemd.services.nextcloud-setup.serviceConfig.SuccessExitStatus = "0 1";
-        fileSystems."/var/lib/nextcloud/data" = {
-          device = "/media/cloud/nextcloud-data";
-          options = [ "bind" ];
-        };
-        fileSystems."/var/backup" = {
-          device = "/media/cloud/gum-backup";
-          options = [ "bind" ];
-        };
+        systemd.tmpfiles.rules = [
+          "L /var/lib/nextcloud/data - - - -  /media/cloud/nextcloud-data"
+          "L /var/backup - - - -  /media/cloud/gum-backup"
+        ];
+        #fileSystems."/var/lib/nextcloud/data" = {
+        #  device = "/media/cloud/nextcloud-data";
+        #  options = [ "bind" ];
+        #};
+        #fileSystems."/var/backup" = {
+        #  device = "/media/cloud/gum-backup";
+        #  options = [ "bind" ];
+        #};
       }
 
       <stockholm/makefu/2configs/nginx/dl.euer.krebsco.de.nix>
@@ -159,6 +164,7 @@ in {
       <stockholm/makefu/2configs/nginx/euer.mon.nix>
       <stockholm/makefu/2configs/nginx/euer.wiki.nix>
       <stockholm/makefu/2configs/nginx/euer.blog.nix>
+      <stockholm/makefu/2configs/nginx/music.euer.nix>
       ## <stockholm/makefu/2configs/nginx/gum.krebsco.de.nix>
       #<stockholm/makefu/2configs/nginx/public_html.nix>
       #<stockholm/makefu/2configs/nginx/update.connector.one.nix>
diff --git a/makefu/1systems/wbob/config.nix b/makefu/1systems/wbob/config.nix
index 60f4f7b72..d4d0f4b69 100644
--- a/makefu/1systems/wbob/config.nix
+++ b/makefu/1systems/wbob/config.nix
@@ -34,6 +34,7 @@ in {
       # <stockholm/makefu/2configs/hydra/stockholm.nix>
 
       <stockholm/makefu/2configs/share/wbob.nix>
+      <stockholm/makefu/2configs/wireguard/thierry.nix>
       <stockholm/makefu/2configs/bluetooth-mpd.nix>
 
       # Sensors
@@ -54,6 +55,13 @@ in {
       # <stockholm/makefu/2configs/bureautomation/visitor-photostore.nix>
       # <stockholm/makefu/2configs/bureautomation/mpd.nix> #mpd is only used for TTS, this is the web interface
       <stockholm/makefu/2configs/mqtt.nix>
+      {
+        services.mjpg-streamer = {
+          enable = true;
+          inputPlugin = "input_uvc.so -d /dev/video0 -r 640x480 -y -f 30 -q 50 -n";
+          outputPlugin = "output_http.so -w @www@ -n -p 18088";
+        };
+      }
       (let
           collectd-port = 25826;
           influx-port = 8086;