This repository has no description
move pad.lassul.us from prism to neoprism
author
lassulus
date
(Nov 22, 2024, 2:30 AM CET)
commit
1157b307
1157b30739974f976dd326c35c011fa8aff0d00a
parent
e6a44ed0
e6a44ed09658e0511378519f88cd64c9fddedf97
+102
-93
+72
-69
2configs/codimd.nix
+72
-69
2configs/codimd.nix
···
1
-
{ config, pkgs, ... }:
1
+
{ ... }:
2
2
let
3
3
domain = "pad.lassul.us";
4
4
in
5
5
{
6
6
7
7
# redirect legacy domain to new one
8
-
services.nginx.virtualHosts."codi.lassul.us" = {
9
-
enableACME = true;
10
-
addSSL = true;
11
-
locations."/".return = "301 https://${domain}\$request_uri";
12
-
};
8
+
# services.nginx.virtualHosts."codi.lassul.us" = {
9
+
# enableACME = true;
10
+
# addSSL = true;
11
+
# locations."/".return = "301 https://${domain}\$request_uri";
12
+
# };
13
13
14
14
services.nginx.virtualHosts.${domain} = {
15
15
enableACME = true;
16
16
forceSSL = true;
17
+
acmeFallbackHost = "neoprism.lassul.us";
17
18
locations."/" = {
18
-
proxyPass = "https://localhost:3091";
19
+
# proxyPass = "https://localhost:3091";
20
+
proxyPass = "https://neoprism.lassul.us";
19
21
proxyWebsockets = true;
22
+
recommendedProxySettings = true;
20
23
};
21
24
};
22
25
23
-
security.acme.certs.${domain}.group = "hedgecert";
24
-
users.groups.hedgecert.members = [
25
-
"hedgedoc"
26
-
"nginx"
27
-
];
26
+
# security.acme.certs.${domain}.group = "hedgecert";
27
+
# users.groups.hedgecert.members = [
28
+
# "hedgedoc"
29
+
# "nginx"
30
+
# ];
28
31
29
-
security.dhparams = {
30
-
enable = true;
31
-
params.hedgedoc = { };
32
-
};
32
+
# security.dhparams = {
33
+
# enable = true;
34
+
# params.hedgedoc = { };
35
+
# };
33
36
34
-
services.borgbackup.jobs.hetzner.paths = [
35
-
"/var/backup"
36
-
"/var/lib/hedgedoc"
37
-
];
38
-
systemd.services.hedgedoc-backup = {
39
-
startAt = "daily";
40
-
serviceConfig = {
41
-
ExecStart = pkgs.writers.writeDash "pad-backup" ''
42
-
until ${pkgs.sqlite}/bin/sqlite3 /var/lib/hedgedoc/db.hedgedoc.sqlite ".backup /var/backup/hedgedoc/backup.sq3"; do
43
-
sleep 1
44
-
done
45
-
'';
46
-
Type = "oneshot";
47
-
};
48
-
};
37
+
# services.borgbackup.jobs.hetzner.paths = [
38
+
# "/var/backup"
39
+
# "/var/lib/hedgedoc"
40
+
# ];
41
+
# systemd.services.hedgedoc-backup = {
42
+
# startAt = "daily";
43
+
# serviceConfig = {
44
+
# ExecStart = pkgs.writers.writeDash "pad-backup" ''
45
+
# until ${pkgs.sqlite}/bin/sqlite3 /var/lib/hedgedoc/db.hedgedoc.sqlite ".backup /var/backup/hedgedoc/backup.sq3"; do
46
+
# sleep 1
47
+
# done
48
+
# '';
49
+
# Type = "oneshot";
50
+
# };
51
+
# };
49
52
50
-
systemd.services.hedgedoc.environment = {
51
-
CMD_COOKIE_POLICY = "none";
52
-
CMD_CSP_ALLOW_FRAMING = "true";
53
-
};
53
+
# systemd.services.hedgedoc.environment = {
54
+
# CMD_COOKIE_POLICY = "none";
55
+
# CMD_CSP_ALLOW_FRAMING = "true";
56
+
# };
54
57
55
-
services.hedgedoc = {
56
-
enable = true;
57
-
settings = {
58
-
allowOrigin = [ domain ];
59
-
db = {
60
-
dialect = "sqlite";
61
-
storage = "/var/lib/hedgedoc/db.hedgedoc.sqlite";
62
-
};
63
-
useCDN = false;
64
-
port = 3091;
65
-
domain = domain;
66
-
allowFreeURL = true;
67
-
defaultPermission = "freely";
58
+
# services.hedgedoc = {
59
+
# enable = true;
60
+
# settings = {
61
+
# allowOrigin = [ domain ];
62
+
# db = {
63
+
# dialect = "sqlite";
64
+
# storage = "/var/lib/hedgedoc/db.hedgedoc.sqlite";
65
+
# };
66
+
# useCDN = false;
67
+
# port = 3091;
68
+
# domain = domain;
69
+
# allowFreeURL = true;
70
+
# defaultPermission = "freely";
68
71
69
-
useSSL = true;
70
-
protocolUseSSL = true;
71
-
sslCAPath = [ "/etc/ssl/certs/ca-certificates.crt" ];
72
-
sslCertPath = "/var/lib/acme/${domain}/cert.pem";
73
-
sslKeyPath = "/var/lib/acme/${domain}/key.pem";
74
-
dhParamPath = config.security.dhparams.params.hedgedoc.path;
75
-
};
72
+
# useSSL = true;
73
+
# protocolUseSSL = true;
74
+
# sslCAPath = [ "/etc/ssl/certs/ca-certificates.crt" ];
75
+
# sslCertPath = "/var/lib/acme/${domain}/cert.pem";
76
+
# sslKeyPath = "/var/lib/acme/${domain}/key.pem";
77
+
# dhParamPath = config.security.dhparams.params.hedgedoc.path;
78
+
# };
76
79
77
-
# https://github.com/settings/applications/2352617
78
-
environmentFile = config.clanCore.facts.secretUploadDirectory + "/hedgedoc.env";
79
-
};
80
+
# # https://github.com/settings/applications/2352617
81
+
# environmentFile = config.clanCore.facts.secretUploadDirectory + "/hedgedoc.env";
82
+
# };
80
83
81
-
clanCore.facts.services.hedgedoc-github-auth = {
82
-
secret."hedgedoc.env" = { };
83
-
generator.script = ''
84
-
echo "$prompt_value" > "$secrets"/hedgedoc.env
85
-
'';
86
-
generator.prompt = ''
87
-
goto https://github.com/settings/applications/2352617 and paste the data in the following format:
88
-
GITHUB_CLIENT_ID=...
89
-
GITHUB_CLIENT_SECRET=...
90
-
'';
91
-
};
84
+
# clanCore.facts.services.hedgedoc-github-auth = {
85
+
# secret."hedgedoc.env" = { };
86
+
# generator.script = ''
87
+
# echo "$prompt_value" > "$secrets"/hedgedoc.env
88
+
# '';
89
+
# generator.prompt = ''
90
+
# goto https://github.com/settings/applications/2352617 and paste the data in the following format:
91
+
# GITHUB_CLIENT_ID=...
92
+
# GITHUB_CLIENT_SECRET=...
93
+
# '';
94
+
# };
92
95
}
+2
-4
2configs/dns/lassul.us.zone
+2
-4
2configs/dns/lassul.us.zone
···
1
-
@ 3600 IN SOA lassul.us. ns1.lassul.us. 2024081401 7200 3600 86400 3600
1
+
@ 3600 IN SOA lassul.us. ns1.lassul.us. 2024112201 7200 3600 86400 3600
2
2
3
3
;;@ 3600 IN NS ns1
4
4
@ 3600 IN NS ns1
···
34
34
www IN CNAME prism
35
35
cache IN CNAME prism
36
36
cgit IN CNAME prism
37
-
pad IN CNAME prism
38
-
pad2 IN CNAME neoprism
39
-
codi IN CNAME prism
37
+
pad IN CNAME neoprism
40
38
go IN CNAME neoprism
41
39
cast IN CNAME neoprism
42
40
lol IN CNAME prism
+1
-1
2configs/services/pad/default.nix
+1
-1
2configs/services/pad/default.nix
+27
-19
2configs/services/pad/module.nix
+27
-19
2configs/services/pad/module.nix
···
1
1
{
2
-
self,
3
2
lib,
4
3
config,
5
4
...
6
5
}:
7
6
{
8
-
imports = [
9
-
self.inputs.clan-core.clanModules.postgresql
10
-
];
11
7
options.clan.hedgedoc = {
12
8
domain = lib.mkOption {
13
9
type = lib.types.str;
···
15
11
};
16
12
};
17
13
config = {
18
-
clan.postgresql.users.hedgedoc = { };
19
-
clan.postgresql.databases.hedgedoc.create.options.OWNER = "matrix-synapse";
20
-
systemd.services.hedgedoc.environment = {
21
-
CMD_COOKIE_POLICY = "none";
22
-
CMD_CSP_ALLOW_FRAMING = "true";
14
+
15
+
security.acme.certs.${config.clan.hedgedoc.domain}.group = "hedgecert";
16
+
users.groups.hedgecert.members = [
17
+
"hedgedoc"
18
+
"nginx"
19
+
];
20
+
21
+
security.dhparams = {
22
+
enable = true;
23
+
params.hedgedoc = { };
23
24
};
24
25
25
26
services.hedgedoc = {
26
27
enable = true;
27
28
settings = {
28
-
allowOrigin = [ config.clan.hedgedoc.domain ];
29
-
db = {
30
-
dialect = "postgres";
31
-
host = "/run/postgresql";
32
-
database = "hedgedoc";
33
-
username = "hedgedoc";
34
-
};
29
+
allowOrigin = [
30
+
"localhost"
31
+
config.clan.hedgedoc.domain
32
+
];
35
33
useCDN = false;
36
34
port = 3091;
37
35
domain = config.clan.hedgedoc.domain;
38
36
allowFreeURL = true;
39
37
defaultPermission = "freely";
40
-
useSSL = false;
41
-
debug = true;
38
+
# debug = true;
39
+
# useSSL = true;
40
+
# hsts.enable = false;
41
+
# protocolUseSSL = true;
42
+
43
+
useSSL = true;
44
+
protocolUseSSL = true;
45
+
sslCAPath = [ "/etc/ssl/certs/ca-certificates.crt" ];
46
+
sslCertPath = "/var/lib/acme/${config.clan.hedgedoc.domain}/cert.pem";
47
+
sslKeyPath = "/var/lib/acme/${config.clan.hedgedoc.domain}/key.pem";
48
+
dhParamPath = config.security.dhparams.params.hedgedoc.path;
42
49
};
43
50
};
44
51
···
46
53
enableACME = true;
47
54
forceSSL = true;
48
55
locations."/" = {
49
-
proxyPass = "http://localhost:${toString config.services.hedgedoc.settings.port}";
56
+
proxyPass = "https://localhost:3091";
57
+
# proxyPass = "http://localhost:${toString config.services.hedgedoc.settings.port}";
50
58
proxyWebsockets = true;
51
59
};
52
60
};