From 303888dfd9cebb243b431169fb58889b486289a6 Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Mon, 23 Oct 2023 10:27:30 +0200 Subject: [PATCH] nixify the manual --- flake.lock | 45 +++++++++++++++++++++++++++++++++------------ flake.nix | 6 +++++- modules/manual.nix | 28 +++++++++++++++------------- 3 files changed, 53 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index 235d20e..363881f 100644 --- a/flake.lock +++ b/flake.lock @@ -22,6 +22,26 @@ "type": "github" } }, + "ese-manual": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1698049587, + "narHash": "sha256-gNxpJdxSrpWMTBSGFO4HfXgr+FiAGtwEXCvxd6W8IUQ=", + "ref": "refs/heads/main", + "rev": "2d05abcd2b4e59db421c86fa9adaffa3dccb1086", + "revCount": 7, + "type": "git", + "url": "https://git.ifsr.de/ese/manual-website" + }, + "original": { + "type": "git", + "url": "https://git.ifsr.de/ese/manual-website" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -85,11 +105,11 @@ ] }, "locked": { - "lastModified": 1697340827, - "narHash": "sha256-XlrR68N7jyaZ0bs8TPrhqcWG0IPG3pbjrKzJMpYOsos=", + "lastModified": 1697946153, + "narHash": "sha256-7k7qIwWLaYPgQ4fxmEdew3yCffhK6rM4I4Jo3X/79DA=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "29977d0796c058bbcfb2df5b18eb5badf1711007", + "rev": "5a2006282caaf32663cdcd582c5b18809c7d7d8d", "type": "github" }, "original": { @@ -100,11 +120,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1697655685, - "narHash": "sha256-79Kuv+QdgsVc+rkibuAgWHnh8IXrLBTOKg5nM0Qvux0=", + "lastModified": 1697851979, + "narHash": "sha256-lJ8k4qkkwdvi+t/Xc6Fn74kUuobpu9ynPGxNZR6OwoA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "80c1aab725151632ddc2a20caeb914e76dd0673c", + "rev": "5550a85a087c04ddcace7f892b0bdc9d8bb080c8", "type": "github" }, "original": { @@ -116,11 +136,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1697332183, - "narHash": "sha256-ACYvYsgLETfEI2xM1jjp8ZLVNGGC0onoCGe+69VJGGE=", + "lastModified": 1697929210, + "narHash": "sha256-RkQZif6QhswEwv7484mrKfIU8XmIWm+ED6llbr4IyxM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e1cff585c1a85aeab059d3109f66134a8f76935", + "rev": "fb000224952bf7749a9e8b3779104ef7ea4465c8", "type": "github" }, "original": { @@ -155,6 +175,7 @@ "root": { "inputs": { "course-management": "course-management", + "ese-manual": "ese-manual", "kpp": "kpp", "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs", @@ -169,11 +190,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1697339241, - "narHash": "sha256-ITsFtEtRbCBeEH9XrES1dxZBkE1fyNNUfIyQjQ2AYQs=", + "lastModified": 1697943852, + "narHash": "sha256-DaBxUPaZhQ3yLCmAATshYB7qo7NwcMvSFWz9T3bjYYY=", "owner": "Mic92", "repo": "sops-nix", - "rev": "51186b8012068c417dac7c31fb12861726577898", + "rev": "30a0ba4a20703b4bfe047fe5def1fc24978e322c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9d16c52..f620b9e 100755 --- a/flake.nix +++ b/flake.nix @@ -7,12 +7,15 @@ nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; kpp.url = "github:fsr/kpp"; kpp.inputs.nixpkgs.follows = "nixpkgs"; + ese-manual.url = "git+https://git.ifsr.de/ese/manual-website"; + ese-manual.inputs.nixpkgs.follows = "nixpkgs"; + course-management = { url = "github:fsr/course-management"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { self, nixpkgs, sops-nix, nix-index-database, kpp, course-management, ... }@inputs: + outputs = { self, nixpkgs, sops-nix, nix-index-database, kpp, ese-manual, course-management, ... }@inputs: { packages."x86_64-linux".quitte = self.nixosConfigurations.quitte.config.system.build.toplevel; packages."x86_64-linux".default = self.packages."x86_64-linux".quitte; @@ -27,6 +30,7 @@ inputs.sops-nix.nixosModules.sops inputs.kpp.nixosModules.default inputs.nix-index-database.nixosModules.nix-index + ese-manual.nixosModules.default course-management.nixosModules.default ./hosts/quitte/configuration.nix ./modules/bacula.nix diff --git a/modules/manual.nix b/modules/manual.nix index ab58e76..d827502 100644 --- a/modules/manual.nix +++ b/modules/manual.nix @@ -1,14 +1,16 @@ -{ pkgs, config, lib, ... }: -let - domain = "manual.${config.networking.domain}"; -in -{ - services.nginx = { - enable = true; - virtualHosts."${domain}" = { - addSSL = true; - enableACME = true; - root = "/srv/web/manual-website/site"; - }; - }; +{ pkgs, config, lib, ... }: +let + domain = "manual.${config.networking.domain}"; +in +{ + services.ese-manual = { + enable = true; + hostName = domain; + }; + services.nginx = { + virtualHosts."${domain}" = { + addSSL = true; + enableACME = true; + }; + }; }