From 72d8ea37cc19a0d09dedef55d540c6b06ebcdbd1 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 6 Jan 2018 20:51:32 +0100
Subject: ma gum.r: add vbob to wireguard

---
 makefu/1systems/gum/config.nix | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

(limited to 'makefu/1systems/gum')

diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix
index 1fe0b62f9..6e5f3c2d4 100644
--- a/makefu/1systems/gum/config.nix
+++ b/makefu/1systems/gum/config.nix
@@ -108,16 +108,35 @@ in {
       #  };
       #}
       { # wireguard server
-        networking.firewall.allowedUDPPorts = [ 51820 ];
+
+        # TODO: networking.nat
+
+        # boot.kernel.sysctl."net.ipv4.ip_forward" = 1;
+        # conf.all.proxy_arp =1
+        networking.firewall = {
+          allowedUDPPorts = [ 51820 ];
+          extraCommands = ''
+            iptables -t nat -A POSTROUTING -s 10.244.0.0/24 -o ${ext-if} -j MASQUERADE
+          '';
+        };
+
         networking.wireguard.interfaces.wg0 = {
           ips = [ "10.244.0.1/24" ];
+          listenPort = 51820;
           privateKeyFile = (toString <secrets>) + "/wireguard.key";
           allowedIPsAsRoutes = true;
-          peers = [{
-            # allowedIPs = [ "0.0.0.0/0" "::/0" ];
+          peers = [
+          {
+            # x
             allowedIPs = [ "10.244.0.2/32" ];
             publicKey = "fe5smvKVy5GAn7EV4w4tav6mqIAKhGWQotm7dRuRt1g=";
-          }];
+          }
+          {
+            # vbob
+            allowedIPs = [ "10.244.0.3/32" ];
+            publicKey = "Lju7EsCu1OWXhkhdNR7c/uiN60nr0TUPHQ+s8ULPQTw=";
+          }
+          ];
         };
       }
 
-- 
cgit v1.3.1


From cc51c5f7db21749b87b0db096087b7e7447a8f0a Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 10 Jan 2018 00:04:07 +0100
Subject: ma photostore.krebsco.de: init on gum.r

also init the application server and config
---
 krebs/3modules/makefu/default.nix                  |  1 +
 makefu/1systems/gum/config.nix                     |  2 +-
 .../2configs/deployment/photostore.krebsco.de.nix  | 40 ++++++++++++++++++++++
 makefu/5pkgs/cameraupload-server/default.nix       | 23 +++++++++++++
 4 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 makefu/2configs/deployment/photostore.krebsco.de.nix
 create mode 100644 makefu/5pkgs/cameraupload-server/default.nix

(limited to 'makefu/1systems/gum')

diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix
index 9f1842b88..56e5c6b82 100644
--- a/krebs/3modules/makefu/default.nix
+++ b/krebs/3modules/makefu/default.nix
@@ -541,6 +541,7 @@ with import <stockholm/lib>;
           graph             IN A      ${nets.internet.ip4.addr}
           ghook             IN A      ${nets.internet.ip4.addr}
           dockerhub         IN A      ${nets.internet.ip4.addr}
+          photostore        IN A      ${nets.internet.ip4.addr}
           io                IN NS     gum.krebsco.de.
         '';
       };
diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix
index 6e5f3c2d4..f473d9e4c 100644
--- a/makefu/1systems/gum/config.nix
+++ b/makefu/1systems/gum/config.nix
@@ -67,7 +67,7 @@ in {
       <stockholm/makefu/2configs/nginx/public_html.nix>
       <stockholm/makefu/2configs/nginx/update.connector.one.nix>
 
-      <stockholm/makefu/2configs/deployment/mycube.connector.one.nix>
+      <stockholm/makefu/2configs/deployment/photostore.krebsco.de.nix>
       <stockholm/makefu/2configs/deployment/graphs.nix>
       <stockholm/makefu/2configs/deployment/owncloud.nix>
       <stockholm/makefu/2configs/deployment/boot-euer.nix>
diff --git a/makefu/2configs/deployment/photostore.krebsco.de.nix b/makefu/2configs/deployment/photostore.krebsco.de.nix
new file mode 100644
index 000000000..9e16a384a
--- /dev/null
+++ b/makefu/2configs/deployment/photostore.krebsco.de.nix
@@ -0,0 +1,40 @@
+{ config, lib, pkgs, ... }:
+# more than just nginx config but not enough to become a module
+with import <stockholm/lib>;
+let
+  wsgi-sock = "${workdir}/uwsgi-photostore.sock";
+  workdir = config.services.uwsgi.runDir;
+in {
+
+  services.uwsgi = {
+    enable = true;
+    user = "nginx";
+    runDir = "/var/lib/photostore";
+    plugins = [ "python3" ];
+    instance = {
+      type = "emperor";
+      vassals = {
+        cameraupload-server = {
+          type = "normal";
+          pythonPackages = self: with self; [ pkgs.cameraupload-server ];
+          socket = wsgi-sock;
+        };
+      };
+    };
+  };
+
+  services.nginx = {
+    enable = mkDefault true;
+    virtualHosts."photostore.krebsco.de" = {
+        locations = {
+          "/".extraConfig = ''
+          uwsgi_pass                  unix://${wsgi-sock};
+          uwsgi_param UWSGI_CHDIR     ${workdir};
+          uwsgi_param UWSGI_MODULE    cuserver.main;
+          uwsgi_param UWSGI_CALLABLE  app;
+          include                     ${pkgs.nginx}/conf/uwsgi_params;
+        '';
+      };
+    };
+  };
+}
diff --git a/makefu/5pkgs/cameraupload-server/default.nix b/makefu/5pkgs/cameraupload-server/default.nix
new file mode 100644
index 000000000..e2e410958
--- /dev/null
+++ b/makefu/5pkgs/cameraupload-server/default.nix
@@ -0,0 +1,23 @@
+{ lib, pkgs, fetchFromGitHub, ... }:
+
+with pkgs.python3Packages;buildPythonPackage rec {
+  name = "cameraupload-server-${version}";
+  version = "0.2.4";
+
+  propagatedBuildInputs = [
+    flask
+  ];
+
+  src = fetchFromGitHub {
+    owner = "makefu";
+    repo = "cameraupload-server";
+    rev = "c98c8ec";
+    sha256 = "0ssgvjm0z399l62wkgjk8c75mvhgn5z7g1dkb78r8vrih9428bb8";
+  };
+
+  meta = {
+    homepage = https://github.com/makefu/cameraupload-server;
+    description = "server side for cameraupload_full";
+    license = lib.licenses.asl20;
+  };
+}
-- 
cgit v1.3.1