Skip to content

Commit 918041e

Browse files
committed
rm authelia, wraspi acme
1 parent 487192f commit 918041e

File tree

10 files changed

+9
-212
lines changed

10 files changed

+9
-212
lines changed

hosts/blender/configuration.nix

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
{ config, pkgs, inputs, ... }:
2-
let
3-
authelia = import ../../modules/nixos/authelia/stuff.nix;
4-
in
52
{
63
imports = [
74
./hardware-configuration.nix
@@ -96,10 +93,8 @@ in
9693
services.nginx.virtualHosts."torrent.pine.marco.ooo" = {
9794
forceSSL = true;
9895
useACMEHost = "pine.marco.ooo";
99-
extraConfig = authelia.nginx.enableVhost;
10096
locations."/" = {
10197
proxyPass = "http://127.0.0.1:9091";
102-
extraConfig = authelia.nginx.enableLocation;
10398
};
10499
};
105100

@@ -124,24 +119,6 @@ in
124119
clientMaxBodySize = "200m";
125120
};
126121

127-
age.secrets."authelia.jwtSecretFile" = {
128-
file = ../../secrets/authelia.jwtSecretFile.age;
129-
owner = config.services.authelia.instances.main.user;
130-
group = config.services.authelia.instances.main.group;
131-
};
132-
age.secrets."authelia.storageEncryptionKeyFile" = {
133-
file = ../../secrets/authelia.storageEncryptionKeyFile.age;
134-
owner = config.services.authelia.instances.main.user;
135-
group = config.services.authelia.instances.main.group;
136-
};
137-
138-
modules.authelia = {
139-
enable = true;
140-
domain = "pine.marco.ooo";
141-
jwtSecretFile = config.age.secrets."authelia.jwtSecretFile".path;
142-
storageEncryptionKeyFile = config.age.secrets."authelia.storageEncryptionKeyFile".path;
143-
};
144-
145122
services.sonarr = {
146123
enable = true;
147124
user = "nas";

hosts/wraspi/configuration.nix

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,8 @@
55

66
modules.home-manager.enable = true;
77

8-
age.secrets."risaro.la" = {
9-
file = ../../secrets/risaro.la.age;
10-
};
11-
128
users.groups."sslcerts" = { };
139

14-
security.acme.acceptTerms = true;
15-
security.acme.defaults = {
16-
email = inputs.self.users.marco.email;
17-
server = "https://acme-staging-v02.api.letsencrypt.org/directory";
18-
group = "sslcerts";
19-
dnsProvider = "cloudflare";
20-
credentialsFile = config.age.secrets."risaro.la".path;
21-
};
22-
security.acme.certs."risaro.la" = {
23-
domain = "*.risaro.la";
24-
};
25-
2610
fileSystems."/" = {
2711
device = "/dev/disk/by-label/NIXOS_SD";
2812
fsType = "ext4";

modules/nixos/authelia/authelia-authrequest.conf

Lines changed: 0 additions & 25 deletions
This file was deleted.

modules/nixos/authelia/authelia-location.conf

Lines changed: 0 additions & 36 deletions
This file was deleted.

modules/nixos/authelia/default.nix

Lines changed: 0 additions & 57 deletions
This file was deleted.

modules/nixos/authelia/proxy.conf

Lines changed: 0 additions & 35 deletions
This file was deleted.

modules/nixos/authelia/stuff.nix

Lines changed: 0 additions & 4 deletions
This file was deleted.

modules/nixos/base/default.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ in
1919
../network-stuff.nix
2020
../desktop.nix
2121
../home-manager.nix
22-
../authelia
2322
../hyprland
2423
];
2524

secrets/risaro.la.age

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
age-encryption.org/v1
2-
-> ssh-ed25519 +zi6VA o6S27FfE9LZHFPcjTDw0vt/koYYe6hJSnIvbgfvLDmM
3-
Ctm0jv45RbzgVAhzXSWKHkgDoIPWqtZ2TGYW0XuGxf4
4-
-> ssh-ed25519 bZ4Dwg jUYzcxqVAp5BHO5AfIyHae0Q1DHKOyiFLKNJgRo2Nhc
5-
DSM0PX0TD5OQy8iBxITPJbRbF8klIVnBzdADjHNehpE
6-
-> ssh-ed25519 nTQHAw tpiCXGfgQBeDjsaSyD5aK3RbkWCcSHNsSeohNuPDmGQ
7-
YVhsSHpWRSmNMEe+jTmj7hWzfAYzgVtuHZNbMO9tBhA
8-
-> ssh-ed25519 nVBvsw LOL04reoenIUdfTDOe/vcgFO3rMaqyAfsiagUdtO7Ag
9-
c00OQUicMiiPr3C/3R5hZeIEsA7UeGpU7N6uSJEe6/M
10-
--- yTQAqOmUQJuBVkTI/PPc88SSCpbP31St2ky/PKU2BV0
11-
����T�-�<2ă$�\��3�����Q �~(< �k0���ac�F�{+7�T �1菋��F� TM7�–,���7W�ݴ�A� �h�
2+
-> ssh-ed25519 +zi6VA K9ZD4CeixZyRpUTP4w4woodgN4kEn0xHMiNEv8SX8V0
3+
jvTm1JAwuqcxN+lov4s6W4t/VLyUt5vwzUTMl0mD0kw
4+
-> ssh-ed25519 nTQHAw rdHZQkfVwlinXtJlYTTBtVz+Oiy2r1LCEmqCgCoN0VQ
5+
Bd8S+9e1wNJScN7815dibyeGF0dpDsYhDqja45CSj2I
6+
-> ssh-ed25519 nVBvsw yX85FYBckXNW9PRzkzJ0CWU/2usUXcjshEP7aKtcsyM
7+
6GPWQth6nBEG8pqqjBFsZHqslAGDjnJLMPdyVBxLE/U
8+
--- 7f3GCair1ZhL17p4XDrC2Ym80ruQU3gVcX/ZcQ+XE+c
9+
`1y<�Tk�}�����LiKki�ڂ���a��K��Ҏ!}�'Y�^�_�l�5�eQ�^s��Z]�}=Mn^��˂t�ѪF��GwZS�2

secrets/secrets.nix

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
let
2-
blender = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJI74ZGq82VySA5AS5OCvafmhVwARDRlYow+mKXq6eIE";
32
qraspi = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILUnZQFo+GMqhnNUfzExwZvZRPmOy8+bZyABQCsSyqT0";
43
mixer = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBWCTtXHe/Zpr9qyWhDVY+pKX/b/VA3DFiUrDpOQFCl4";
54
toaster = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIwYNiDUMF/rOBh929JDGXtr5371osQkgHAa7pmiuTwr";
65
other = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIR/Dqd+UXeEQovChEHgDhIIaXcrpa+i2/KwECTbkp5q";
76
github-runner = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFtY5AcmCumRiR3YDnMfNU7Ye1EPTKO6Lf9V0jphOCay";
8-
wraspi = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL7U4YkBp3TyEZNETH0kFlyjTBTRPy74LqMs43TuwslO";
97
in
108
{
11-
"authelia.jwtSecretFile.age".publicKeys = [ blender ];
12-
"authelia.storageEncryptionKeyFile.age".publicKeys = [ blender ];
13-
"risaro.la.age".publicKeys = [ qraspi wraspi toaster other ];
9+
"risaro.la.age".publicKeys = [ qraspi toaster other ];
1410
"somefile.zip.age".publicKeys = [ mixer toaster other ];
1511
"github-runner-ncc-1.age".publicKeys = [ github-runner toaster other ];
1612
}

0 commit comments

Comments
 (0)