Merge remote-tracking branch 'ni/master'

3 files changed, 28 insertions, 10 deletions

diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix
index 4d22fdff5..50444c1ee 100644
--- a/tv/2configs/gitrepos.nix
+++ b/tv/2configs/gitrepos.nix
@@ -109,7 +109,6 @@ let {
     };
     q = {};
     reaktor2 = {};
-    regfish = {};
     stockholm = {
       cgit.desc = "NixOS configuration";
     };
@@ -156,6 +155,7 @@ let {
     painload = {};
     push = {};
     Reaktor = {};
+    regfish = {};
     with-tmpdir = {};
     get = {};
     load-env = {};
diff --git a/tv/2configs/nginx/default.nix b/tv/2configs/nginx/default.nix
index b0acb9435..efea3a844 100644
--- a/tv/2configs/nginx/default.nix
+++ b/tv/2configs/nginx/default.nix
@@ -4,22 +4,19 @@ with import <stockholm/lib>;
 
 {
   services.nginx = {
+    enableReload = true;
+
     recommendedGzipSettings = true;
     recommendedOptimisation = true;
     recommendedTlsSettings = true;
 
-    virtualHosts._http = {
+    virtualHosts.${toJSON ""} = {
       default = true;
       extraConfig = ''
-        return 404;
-      '';
-    };
-
-    virtualHosts.default = {
-      locations."= /etc/os-release".extraConfig = ''
-        default_type text/plain;
-        alias /etc/os-release;
+        error_page 400 =444 /;
+        return 444;
       '';
+      rejectSSL = true;
     };
   };
   tv.iptables = {
diff --git a/tv/5pkgs/override/jc.nix b/tv/5pkgs/override/jc.nix
new file mode 100644
index 000000000..346dd3eee
--- /dev/null
+++ b/tv/5pkgs/override/jc.nix
@@ -0,0 +1,21 @@
+self: super:
+
+let
+  version = "1.21.0";
+in
+
+# Prevent downgrades.
+assert self.lib.versionAtLeast version super.jc.version;
+
+self.python3.pkgs.toPythonApplication
+  (self.python3.pkgs.jc.overrideAttrs
+    (oldAttrs: {
+      name = "jc-${version}";
+      version = version;
+      src = self.fetchFromGitHub {
+        owner = "kellyjonbrazil";
+        repo = "jc";
+        rev = "v${version}";
+        sha256 = "sha256-kS42WokR7ZIqIPi8LbX4tmtjn37tckea2ELbuqzTm2o";
+      };
+    }))