From f92e88c0ac4d00ce42fab3e2ddd7193d06d59a5b Mon Sep 17 00:00:00 2001 From: Jade Date: Mon, 6 Feb 2023 10:51:15 +0100 Subject: [PATCH] fixed website meow --- flake.lock | 64 ++++++++++++++++++++++++++++++++++++----- flake.nix | 1 + schrottserver/proxy.nix | 15 ++++++++++ 3 files changed, 73 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 5f38f6f..fabeba9 100644 --- a/flake.lock +++ b/flake.lock @@ -35,6 +35,20 @@ "type": "github" } }, + "flake-utils_2": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "id": "flake-utils", + "type": "indirect" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -43,11 +57,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1675371293, - "narHash": "sha256-LrCjtrAXj/WJphhGEMnHgZs7oTsfOlvPfOjFTIvg39k=", + "lastModified": 1675637696, + "narHash": "sha256-tilJS8zCS3PaDfVOfsBZ4zspuam8tc7IMZxtGa/K/uo=", "owner": "nix-community", "repo": "home-manager", - "rev": "d1c7730bb707bf8124d997952f7babd2a281ae68", + "rev": "c43d4a3d6d9ef8ddbe2438362f5c775b4186000b", "type": "github" }, "original": { @@ -69,6 +83,25 @@ "type": "path" } }, + "meowsite": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1675676324, + "narHash": "sha256-Q8Ejr4DsqM/6KrIKbDfwYWPJsM1aHl6oE73rxq+AeIg=", + "ref": "refs/heads/master", + "rev": "06c428e28ef530c33b900524459e9e218dd84657", + "revCount": 8, + "type": "git", + "url": "https://gitlab.com/obsidianical/meowsite.git" + }, + "original": { + "type": "git", + "url": "https://gitlab.com/obsidianical/meowsite.git" + } + }, "naersk": { "inputs": { "nixpkgs": "nixpkgs" @@ -132,11 +165,27 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1675273418, - "narHash": "sha256-tpYc4TEGvDzh9uRf44QemyQ4TpVuUbxb07b2P99XDbM=", + "lastModified": 1674407282, + "narHash": "sha256-2qwc8mrPINSFdWffPK+ji6nQ9aGnnZyHSItVcYDZDlk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4d7c2644dbac9cf8282c0afe68fca8f0f3e7b2db", + "rev": "ab1254087f4cdf4af74b552d7fc95175d9bdbb49", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1675545634, + "narHash": "sha256-TbQeQcM5TA/wIho6xtzG+inUfiGzUXi8ewwttiQWYJE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0591d6b57bfeb55dfeec99a671843337bc2c3323", "type": "github" }, "original": { @@ -151,8 +200,9 @@ "easymacros": "easymacros", "home-manager": "home-manager", "mac-brcm-fw": "mac-brcm-fw", + "meowsite": "meowsite", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" } }, "utils": { diff --git a/flake.nix b/flake.nix index 7df9581..6f07685 100644 --- a/flake.nix +++ b/flake.nix @@ -14,6 +14,7 @@ }; #mms.url = "github:mkaito/nixos-modded-minecraft-servers"; easymacros.url = "git+https://gitlab.com/obsidianical/easymacros.git"; + meowsite.url = "git+https://gitlab.com/obsidianical/meowsite.git"; }; outputs = { self, nixpkgs, home-manager, nixos-hardware, mac-brcm-fw, ... }@inputs: { diff --git a/schrottserver/proxy.nix b/schrottserver/proxy.nix index 95da384..52c68be 100644 --- a/schrottserver/proxy.nix +++ b/schrottserver/proxy.nix @@ -4,13 +4,23 @@ acceptTerms = true; defaults.email = "jade@schrottkatze.de"; certs = { + "schrottkatze.de" = { + group = "nginx"; + keyType = "rsa2048"; + }; "vw.schrottkatze.de" = { group = "nginx"; keyType = "rsa2048"; }; + "wolke.schrottkatze.de" = { + group = "nginx"; + keyType = "rsa2048"; + }; }; }; + environment.systemPackages = [ inputs.meowsite.packages."x86_64-linux".default ]; + services.nginx = { enable = true; @@ -20,6 +30,11 @@ recommendedTlsSettings = true; virtualHosts = { + "schrottkatze.de" = { + forceSSL = true; + enableACME = true; + root = "${inputs.meowsite.packages."x86_64-linux".default}"; + }; "vw.schrottkatze.de" = { forceSSL = true; enableACME = true;