Merge remote-tracking branch 'gum/master'

3 files changed, 35 insertions, 5 deletions

diff --git a/krebs/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix
index 6addb0818..914b38051 100644
--- a/krebs/1systems/wolf/config.nix
+++ b/krebs/1systems/wolf/config.nix
@@ -25,6 +25,7 @@ in
     <stockholm/krebs/2configs/shack/muell_caller.nix>
     <stockholm/krebs/2configs/shack/radioactive.nix>
     <stockholm/krebs/2configs/shack/share.nix>
+    <stockholm/krebs/2configs/shack/mobile.mpd.nix>
     {
       systemd.services.telegraf.path = [ pkgs.net_snmp ]; # for snmptranslate
       systemd.services.telegraf.environment = {
@@ -114,7 +115,7 @@ in
   networking = {
     firewall.enable = false;
     firewall.allowedTCPPorts = [ 8088 8086 8083 ];
-    interfaces."${ext-if}".ip4 = [{
+    interfaces."${ext-if}".ipv4.addresses = [{
       address = shack-ip;
       prefixLength = 20;
     }];
diff --git a/krebs/2configs/shack/mobile.mpd.nix b/krebs/2configs/shack/mobile.mpd.nix
new file mode 100644
index 000000000..2dc466edb
--- /dev/null
+++ b/krebs/2configs/shack/mobile.mpd.nix
@@ -0,0 +1,32 @@
+{lib,pkgs, ... }:
+let
+  mpdHost = "mpd.shack";
+  ympd = name: port: let
+    webPort = 10000 + port;
+  in {
+    systemd.services."ympd-${name}" = {
+      description = "mpd for ${name}";
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig.ExecStart = "${pkgs.ympd}/bin/ympd --host ${mpdHost} --port ${toString port} --webport ${toString webPort} --user nobody";
+    };
+    services.nginx.virtualHosts."mobile.${name}.mpd.shack" = {
+      serverAliases = [
+        "${name}.mpd.wolf.r"
+        "${name}.mpd.wolf.shack"
+      ];
+      locations."/".proxyPass = "http://localhost:${toString webPort}";
+    };
+  };
+in lib.mkMerge [{
+  services.nginx.enable = true;
+}
+  (ympd "lounge" 6600)
+  (ympd "seminarraum" 6601)
+  (ympd "elab" 6602)
+  (ympd "kueche" 6603)
+  (ympd "crafting" 6604)
+  (ympd "fablab" 6605)
+  (ympd "workshop" 6606)
+  (ympd "klo" 6607)
+
+]
diff --git a/krebs/3modules/retiolum-bootstrap.nix b/krebs/3modules/retiolum-bootstrap.nix
index 53b06a702..faa3dd714 100644
--- a/krebs/3modules/retiolum-bootstrap.nix
+++ b/krebs/3modules/retiolum-bootstrap.nix
@@ -31,11 +31,8 @@ in
       enable = mkDefault true;
       virtualHosts.retiolum-bootstrap = {
         inherit (cfg) serverName sslCertificate sslCertificateKey;
-        enableSSL = true;
+        forceSSL = true;
         extraConfig =''
-          if ($scheme = http){
-            return 301 https://$server_name$request_uri;
-          }
 
           root ${pkgs.retiolum-bootstrap};
           try_files $uri $uri/retiolum.sh;