Browse Source

Merge branch 'canon' of https://git.qtp2t.club/hazel/etc into canon

canon
Hazel Levine 2 months ago
parent
commit
37aa9666d5
Signed by: hazel GPG Key ID: 1884029A28789A62
7 changed files with 40 additions and 10 deletions
  1. +1
    -0
      machines/kerria/default.nix
  2. +1
    -0
      modules/services/default.nix
  3. +31
    -0
      modules/services/lemniscation.nix
  4. +0
    -1
      modules/services/mail.nix
  5. +0
    -3
      modules/services/nginx.nix
  6. +6
    -5
      modules/services/perihelion.nix
  7. +1
    -1
      nix/sources.json

+ 1
- 0
machines/kerria/default.nix View File

@ -56,6 +56,7 @@
directory = /var/www/wkd;
};
};
lemniscation.enable = true;
mailserver.enable = true;


+ 1
- 0
modules/services/default.nix View File

@ -3,6 +3,7 @@
imports = [
./bitwarden.nix
./gitea.nix
./lemniscation.nix
./linx.nix
./mail.nix
./minecraft.nix


+ 31
- 0
modules/services/lemniscation.nix View File

@ -0,0 +1,31 @@
{ config, lib, pkgs, ... }:
let
cfg = config.hazel.services.lemniscation;
nginxCfg = config.hazel.services.nginx;
in
with lib; {
options.hazel.services.lemniscation.enable = mkEnableOption "lemniscation";
config = mkIf cfg.enable {
services.nginx.virtualHosts = if nginxCfg.enable then
let
redirect = {
forceSSL = nginxCfg.ssl;
enableACME = nginxCfg.ssl;
locations."/" = {
return = "301 http://lemniscation.com";
};
};
in {
"lemniscation.com" = {
forceSSL = nginxCfg.ssl;
enableACME = nginxCfg.ssl;
serverAliases = [ "www.lemniscation.com" ];
root = "/var/www/lemniscation";
};
"lemniscation.qtp2t.club" = redirect;
"lemniscation.knightsofthelambdacalcul.us" = redirect;
} else {};
};
}

+ 0
- 1
modules/services/mail.nix View File

@ -32,7 +32,6 @@ with lib; {
"hazel@knightsofthelambdacalcul.us" = {
hashedPasswordFile = /etc/snm-hashed-passwd;
aliases = [ "postmaster@knightsofthelambdacalcul.us" ];
catchAll = [ "knightsofthelambdacalcul.us" ];
};
};


+ 0
- 3
modules/services/nginx.nix View File

@ -126,8 +126,6 @@ with lib; {
}));
"blog.knightsofthelambdacalcul.us" =
(mkVHost [] "${pkgs.hazel.ziodyne-blog}" {});
"lemniscation.knightsofthelambdacalcul.us" =
(mkVHost [] "/var/www/lemniscation" {});
"mail.knightsofthelambdacalcul.us" =
(mkVHost [] "/var/www/notawebsite" {});
@ -142,7 +140,6 @@ with lib; {
"blog.qtp2t.club" = (mkRedirect "blog");
"cloud.qtp2t.club" = (mkRedirect "cloud");
"git.qtp2t.club" = (mkRedirect "git");
"lemniscation.qtp2t.club" = (mkRedirect "lemniscation");
"p.qtp2t.club" = (mkRedirect "p");
"ring.qtp2t.club" = (mkRedirect "ring");
"vault.qtp2t.club" = (mkRedirect "vault");


+ 6
- 5
modules/services/perihelion.nix View File

@ -19,11 +19,12 @@ with lib; {
];
environment.etc."perihelion/users.txt".text = ''
hazel https://knightsofthelambdacalcul.us/
if https://tilde.club/~if/
haskal https://tilde.town/~haskal/
alicja https://spinlock.icu/
5225225 https://5snb.club/
hazel|https://knightsofthelambdacalcul.us/
if|https://tilde.club/~if/
haskal|https://tilde.town/~haskal/
not-haskal|https://awoo.systems/
5225225|https://5snb.club/
cadence|https://cadence.moe/
'';
systemd.services.perihelion = {


+ 1
- 1
nix/sources.json View File

@ -142,7 +142,7 @@
"perihelion": {
"ref": "canon",
"repo": "https://git.qtp2t.club/hazel/perihelion",
"rev": "2945d803b2b411046f01641a8d5687212d4cac4d",
"rev": "ff88ce09644addf8610d3a190e8a32f9fd2199fd",
"type": "git"
},
"sha256-simd": {


Loading…
Cancel
Save