about summary refs log tree commit diff
path: root/users
diff options
context:
space:
mode:
Diffstat (limited to 'users')
-rw-r--r--users/sterni/machines/edwin/default.nix5
-rw-r--r--users/sterni/machines/edwin/http/sterni.lv.nix16
-rw-r--r--users/sterni/machines/ingeborg/default.nix10
-rw-r--r--users/sterni/machines/ingeborg/gopher.nix (renamed from users/sterni/machines/edwin/gopher.nix)0
-rw-r--r--users/sterni/machines/ingeborg/http/code.sterni.lv.nix (renamed from users/sterni/machines/edwin/http/code.sterni.lv.nix)1
-rw-r--r--users/sterni/machines/ingeborg/http/fcgiwrap.nix (renamed from users/sterni/machines/edwin/http/fcgiwrap.nix)0
-rw-r--r--users/sterni/machines/ingeborg/http/flipdot.openlab-augsburg.de.nix (renamed from users/sterni/machines/edwin/http/flipdot.openlab-augsburg.de.nix)0
-rw-r--r--users/sterni/machines/ingeborg/http/likely-music.sterni.lv.nix (renamed from users/sterni/machines/edwin/http/likely-music.sterni.lv.nix)0
-rw-r--r--users/sterni/machines/ingeborg/http/nginx.nix (renamed from users/sterni/machines/edwin/http/nginx.nix)2
-rw-r--r--users/sterni/machines/ingeborg/http/sterni.lv.nix34
10 files changed, 46 insertions, 22 deletions
diff --git a/users/sterni/machines/edwin/default.nix b/users/sterni/machines/edwin/default.nix
index 00b2851e4eeb..68f20787a9bf 100644
--- a/users/sterni/machines/edwin/default.nix
+++ b/users/sterni/machines/edwin/default.nix
@@ -11,11 +11,6 @@
     ./network.nix
     # These modules configure services, websites etc.
     (depot.path.origSrc + "/ops/modules/btrfs-auto-scrub.nix")
-    ./gopher.nix
-    ./http/sterni.lv.nix
-    ./http/code.sterni.lv.nix
-    ./http/flipdot.openlab-augsburg.de.nix
-    ./http/likely-music.sterni.lv.nix
   ];
 
   config = {
diff --git a/users/sterni/machines/edwin/http/sterni.lv.nix b/users/sterni/machines/edwin/http/sterni.lv.nix
deleted file mode 100644
index 44306c75bf64..000000000000
--- a/users/sterni/machines/edwin/http/sterni.lv.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./nginx.nix
-  ];
-
-  config = {
-    services.nginx.virtualHosts."sterni.lv" = {
-      enableACME = true;
-      forceSSL = true;
-      # TODO(sterni): take website from store, replace /tmp with a simple LRU thing
-      root = toString /srv/http;
-    };
-  };
-}
diff --git a/users/sterni/machines/ingeborg/default.nix b/users/sterni/machines/ingeborg/default.nix
index 206d3fcf53a7..51b5fd41179d 100644
--- a/users/sterni/machines/ingeborg/default.nix
+++ b/users/sterni/machines/ingeborg/default.nix
@@ -13,6 +13,16 @@
     (depot.path.origSrc + "/ops/modules/btrfs-auto-scrub.nix")
     ./monitoring.nix
     ./minecraft.nix
+    ./http/sterni.lv.nix
+    ./http/code.sterni.lv.nix
+    ./http/flipdot.openlab-augsburg.de.nix
+
+    # Inactive:
+    # ./http/likely-music.sterni.lv.nix
+    # ./gopher.nix
+
+    # TODO(sterni): fail2ban
+    # TODO(sterni): automatic backups for full recovery
   ];
 
   config = {
diff --git a/users/sterni/machines/edwin/gopher.nix b/users/sterni/machines/ingeborg/gopher.nix
index 57275e13a55a..57275e13a55a 100644
--- a/users/sterni/machines/edwin/gopher.nix
+++ b/users/sterni/machines/ingeborg/gopher.nix
diff --git a/users/sterni/machines/edwin/http/code.sterni.lv.nix b/users/sterni/machines/ingeborg/http/code.sterni.lv.nix
index 79af1f27d040..94d7915d7fe8 100644
--- a/users/sterni/machines/edwin/http/code.sterni.lv.nix
+++ b/users/sterni/machines/ingeborg/http/code.sterni.lv.nix
@@ -212,7 +212,6 @@ in
               timerConfig = {
                 # Fire every 6h and distribute the workload over next 6h randomly
                 OnCalendar = "*-*-* 00/6:00:00";
-                AccuracySec = "6h";
                 RandomizedDelaySec = "6h";
                 Persistent = true;
               };
diff --git a/users/sterni/machines/edwin/http/fcgiwrap.nix b/users/sterni/machines/ingeborg/http/fcgiwrap.nix
index 19696d85d413..19696d85d413 100644
--- a/users/sterni/machines/edwin/http/fcgiwrap.nix
+++ b/users/sterni/machines/ingeborg/http/fcgiwrap.nix
diff --git a/users/sterni/machines/edwin/http/flipdot.openlab-augsburg.de.nix b/users/sterni/machines/ingeborg/http/flipdot.openlab-augsburg.de.nix
index c86956a0a473..c86956a0a473 100644
--- a/users/sterni/machines/edwin/http/flipdot.openlab-augsburg.de.nix
+++ b/users/sterni/machines/ingeborg/http/flipdot.openlab-augsburg.de.nix
diff --git a/users/sterni/machines/edwin/http/likely-music.sterni.lv.nix b/users/sterni/machines/ingeborg/http/likely-music.sterni.lv.nix
index 8da03ac5e6ec..8da03ac5e6ec 100644
--- a/users/sterni/machines/edwin/http/likely-music.sterni.lv.nix
+++ b/users/sterni/machines/ingeborg/http/likely-music.sterni.lv.nix
diff --git a/users/sterni/machines/edwin/http/nginx.nix b/users/sterni/machines/ingeborg/http/nginx.nix
index 7c99cdd150e0..d551b8391d18 100644
--- a/users/sterni/machines/edwin/http/nginx.nix
+++ b/users/sterni/machines/ingeborg/http/nginx.nix
@@ -24,5 +24,7 @@
         charset utf-8;
       '';
     };
+
+    networking.firewall.allowedTCPPorts = [ 80 443 ];
   };
 }
diff --git a/users/sterni/machines/ingeborg/http/sterni.lv.nix b/users/sterni/machines/ingeborg/http/sterni.lv.nix
new file mode 100644
index 000000000000..50c1bac293e2
--- /dev/null
+++ b/users/sterni/machines/ingeborg/http/sterni.lv.nix
@@ -0,0 +1,34 @@
+{ pkgs, depot, ... }:
+
+let
+  inherit (depot.users.sterni.nix.html)
+    __findFile
+    withDoctype
+    ;
+in
+
+{
+  imports = [
+    ./nginx.nix
+  ];
+
+  config = {
+    services.nginx.virtualHosts."sterni.lv" = {
+      enableACME = true;
+      forceSSL = true;
+      root = pkgs.writeTextFile {
+        name = "sterni.lv-http-root";
+        destination = "/index.html";
+        text = withDoctype (<html> { } [
+          (<head> { } [
+            (<meta> { charset = "utf-8"; } null)
+            (<title> { } "no thoughts")
+          ])
+          (<body> { } "🦩")
+        ]);
+      };
+      # TODO(sterni): tmp.sterni.lv
+      locations."/tmp/".root = toString /srv/http;
+    };
+  };
+}