4 files changed, 47 insertions, 4 deletions
diff --git a/makefu/2configs/bepasty-dual.nix b/makefu/2configs/bepasty-dual.nix
index 701bf5b1d..890652285 100644
--- a/makefu/2configs/bepasty-dual.nix
+++ b/makefu/2configs/bepasty-dual.nix
@@ -28,7 +28,10 @@ in {
     servers = {
       "paste.r" = {
         nginx = {
-          serverAliases = [ "paste.retiolum" "paste.${config.krebs.build.host.name}" ];
+          serverAliases = [
+            "paste.${config.krebs.build.host.name}"
+            "paste.r"
+          ];
         };
         defaultPermissions = "admin,list,create,read,delete";
         secretKeyFile = secKey;
diff --git a/makefu/2configs/collectd/collectd-base.nix b/makefu/2configs/collectd/collectd-base.nix
index 91e5216ad..9168d1fa9 100644
--- a/makefu/2configs/collectd/collectd-base.nix
+++ b/makefu/2configs/collectd/collectd-base.nix
@@ -10,7 +10,7 @@ let
       ModulePath "${collectd-connect-time}/lib/${python.libPrefix}/site-packages/"
       Import "collectd_connect_time"
       <Module collectd_connect_time>
-        target "wry.retiolum" "localhost" "google.com"
+        target "wry.r" "localhost" "google.com"
         interval 30
       </Module>
     </Plugin>
@@ -19,7 +19,7 @@ let
     LoadPlugin write_graphite
     <Plugin "write_graphite">
       <Carbon>
-        Host "heidi.retiolum"
+        Host "heidi.r"
         Port "2003"
         Prefix "retiolum."
         EscapeCharacter "_"
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/2configs/nginx/euer.wiki.nix b/makefu/2configs/nginx/euer.wiki.nix
index ef2c17c63..08bc5659f 100644
--- a/makefu/2configs/nginx/euer.wiki.nix
+++ b/makefu/2configs/nginx/euer.wiki.nix
@@ -76,7 +76,7 @@ in {
     virtualHosts = {
       "${ext-dom}" = {
         #serverAliases = [
-        #  "wiki.makefu.retiolum"
+        #  "wiki.makefu.r"
         #  "wiki.makefu"
         #];
         forceSSL = true;