uku/flake
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: uku:ff71e7439e5752812e31df7a87048cf3042128db
Branches Tags
uku:main
..
compare: uku:a097bd216d34bffaa07338e74ddbd98437212bcb
Branches Tags
uku:main

No commits in common. "ff71e7439e5752812e31df7a87048cf3042128db" and "a097bd216d34bffaa07338e74ddbd98437212bcb" have entirely different histories.
ff71e7439e ... a097bd216d

6 changed files with 24 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flake.lock generated
View file

@ -219,11 +219,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1737885589, "lastModified": 1737746512,
"narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", "narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "rev": "825479c345a7f806485b7f00dbe3abb50641b083",
"type": "github" "type": "github"
}, },
"original": { "original": {

13
secrets/etna/forgejoMailerPasswd.age
View file

@ -1,13 +0,0 @@
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJdk5NTVp0cnhvb21xejZx
V0U3Q2h3YktWOFl6cU4xekVERE5kMWJDanlVCkM3eWQ2TnJHRFR3WlFxZzByaitY
NFd5SC9vdUIwaWJtNXNNODZ3cXMyNjAKLT4gWDI1NTE5IFl1UFJJRlFkTlErM01D
ZCtuQlNwbU1zWTJoQVNpa1FaeGE2UEhzdGF1VEkKMVFFTWx6dXNpeEpEN0pFVkR2
OWFPWmxhUlpjR3A4eUhObDZ3b3BXL3lSWQotPiBYMjU1MTkgU2UrVG1vMU1TYjVv
NytON1R1VVY0MGF6aWo1bVhFMkhRK0VkZFg1YzVrUQptWFpvRW9JSEt0bWN5aWtv
VXE5RDFxSS9LZlovTWsrWHpTL1AyS2dFbDdFCi0+IFgyNTUxOSBBTWhJeWx3b1ZX
U283dUsyYzBVbG9yaFA0a3kzOHZFa0tlNkU1KzlGaFRRClZOaXhsUWFuWG1LRkdX
eG56Z2o1TXlLV2R4cnZ1TzczR2locjM2Z3RkYzQKLS0tIGlYamFQSW1EYnZjcFpZ
WG1nQ1dKV2l4dy96WGhOWlpVc3g1R1AwRjRWc3MKWvXALkzrFnGg5J1P1XI8wBLV
GgX6FnY0WXwrCHi66yZwdyVxdt+B2qyyvFW/jluvk3iC6sNZdJmiv2ggN6zby+M=
-----END AGE ENCRYPTED FILE-----

33
secrets/etna/vaultwardenEnv.age
View file

@ -1,18 +1,19 @@
-----BEGIN AGE ENCRYPTED FILE----- -----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsdmgvSWp2K2lZc0Q5SXho YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFSFJieU9lQnZOQy81VzJK
eWRWd0tKd3ArM1hEMTFITzZDUCsxVGJSK2hBCkZHTHY4ZGVGaVJUMmg4SkRmZzdX V0MwTGFpdWtGenpuWE4xdDR4dWJhQkRwRlZvCm8rMkloMEVhdkkybFhWUmxuekF0
L2txUXNOQkZXK3pWa0xiYnJMZ1BRR3cKLT4gWDI1NTE5IEdlU04zUU45Z2VYNXBp cm04b1hqTGx6V1Nuelg0TVdYK0R5ZEUKLT4gWDI1NTE5IDdxb0x5ZTNnSDV0b3I0
Q2JTYm1EdDc2NzFQTXE3NDlTejdHOGNObVRNajQKOGRtTDYvbFVSSldEd0YxcTd3 Zm5PUE1SelNtbm5pRTV6Zk5PSEo1KzJTckdoUzAKWkZVdTlKRnJYMmpLWlhiSXBX
MDFETWUzdktEWTVvcVJmUmNRaXM2UmdQUQotPiBYMjU1MTkgR2s4NWc2UE55djdJ QzJKaTVxNkNxYk8ydGFtT3NrUEdtRytvMAotPiBYMjU1MTkgWW1UOWdLU3V6Zkhi
b0ZWa1ByY29qZzZacTlLcGFiRUF5bmxDdi90dTJ4UQo0OFNZSFc2TmtMOHJjZTg4 Q0E2QlhHN0huSGs0ZDhmb0pwMzV4MGVzVVViOE9FTQpHSkFvQlNVVDRhS0FiTlR5
djZ3T3ZyZTVDTHhFTkQwVG9zRk5kQ1RMclJVCi0+IFgyNTUxOSBOVFJhNHN1THRN UmZOOGc5ejc2RzgxSHo4ZXRJbzBkeitsT2NRCi0+IFgyNTUxOSBsMVpFdER6MXJ4
QUNVRVk0TGpkR0E3ZFpFZ01lY2QwOGtTR1RCRlBzbmxnClBPMHAxS0FZY0dPdGM3 RlRHSG91TDFMai8vTm1zS1FaSk1HQmEzMDJDbnpaZ0UwCm51MzRWblNNeHBCWHFk
YlZ3OXhORDhYSWZhQWpKaEF6Ynd2OUVwMi82VVEKLS0tIE5HVjRRbzhhTWs5dnh0 Z05FT0ZjNHZjdXljTmlpeVJVNGpVRExPYkVZbmsKLS0tIGJzTkRzVE9GMFJDdStO
cTNnbHh6aWJaV09pc21kZVlCQUlsOGszeW1SUjAKgSD1DTA3dGWPBL3Qh0MM9siJ Tkg3cTVuY0RCWEhlbUhwNGZiMHBCUThlQXRtcFEKcydfFV97p3gVuFaGXP+8l54y
nWaVDa/avM0EMlAFfrsIDgj7Ze+IRJDsjD6xc2Oaz6Ny9lNGSdIyrapdJtHQH8zh v6R0EtjFjbFp7DhWY9Hut1viI0ogstBMilehmjKGrZ6bofWEFEoOod9tiLeQsP3S
bTt49sqzX9MHCDOjXs86E2tZfPpIGiRIU+nmmwglD+SiSx7fqPD7M1IP8RHPi7Tm AmLrJ+Uj0Wz/xLdxydZDVFR51fnJ7KSDOMPbPcIKcryFsuJntRq4g5tEJo2TiuwI
K/JuO0e2uNdCsccv84Bpmxwxc0MYzNQjmIoz4qnX6UZvvPz9J7bYkPSPCdwzWd9U DSQjwrQ69KiH1BXFOYexeKbrfLgIPmU+oYGx/kYGQqcoTu3YegpRQgbShdAZSYJB
zPe6jAEzwxNkCQ1Pry23ilUf7BU5HpNr0cYqS4daJ1kwZazIDqzAm3snoF6F0FsK X713AuYtAxCmPPcoJIMhsuG/TrLlVAPm+3+Y7RogjleubZ3T4OJCtrvz7X0Yllam
EQyH+XtAm7aRHqIT1DgZ/9bFHqGptBgEKgLiouLqcrtWRxSQnUHBcDqcVNzgsPtg mjGOXxm4AVsee6vOJMo1suGKYalnDU3cEyt0lF7aUv7DdLhkRLosvAaa/yL/Veae
1V6yeN/tVXwEZ7fm2oMFZyg+GE9krD8dWPs48SZxu0axwi0oV6w0dJo= cdckvQfLqB6yVYQNP6z1ss8Ry7UhMNjASSSXMZx49rQX1sebCSzYeOVFDbupaCqM
LWv3nr8=
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----

1
secrets/secrets.nix
View file

@ -37,7 +37,6 @@ in
"etna/turnstileSecret.age".publicKeys = main ++ [ etna ]; "etna/turnstileSecret.age".publicKeys = main ++ [ etna ];
"etna/navidromeEnv.age".publicKeys = main ++ [ etna ]; "etna/navidromeEnv.age".publicKeys = main ++ [ etna ];
"etna/forgejoRunnerSecret.age".publicKeys = main ++ [ etna ]; "etna/forgejoRunnerSecret.age".publicKeys = main ++ [ etna ];
"etna/forgejoMailerPasswd.age".publicKeys = main ++ [ etna ];
"etna/vaultwardenEnv.age".publicKeys = main ++ [ etna ]; "etna/vaultwardenEnv.age".publicKeys = main ++ [ etna ];
"etna/vmauthEnv.age".publicKeys = main ++ [ etna ]; "etna/vmauthEnv.age".publicKeys = main ++ [ etna ];
"etna/upsdUserPass.age".publicKeys = main ++ [ etna ]; "etna/upsdUserPass.age".publicKeys = main ++ [ etna ];

14
systems/etna/forgejo.nix
View file

@ -9,7 +9,6 @@ let
secrets = [ secrets = [
"turnstileSecret" "turnstileSecret"
"forgejoRunnerSecret" "forgejoRunnerSecret"
"forgejoMailerPasswd"
]; ];
extra = { extra = {
owner = "forgejo"; owner = "forgejo";
@ -34,7 +33,6 @@ in
secrets = { secrets = {
service.CF_TURNSTILE_SECRET = secrets.get "turnstileSecret"; service.CF_TURNSTILE_SECRET = secrets.get "turnstileSecret";
mailer.PASSWD = secrets.get "forgejoMailerPasswd";
}; };
settings = { settings = {
@ -50,9 +48,6 @@ in
service = { service = {
ALLOW_ONLY_EXTERNAL_REGISTRATION = true; ALLOW_ONLY_EXTERNAL_REGISTRATION = true;
REGISTER_EMAIL_CONFIRM = true;
ENABLE_NOTIFY_EMAIL = true;
EMAIL_DOMAIN_BLOCK_DISPOSABLE = true;
ENABLE_CAPTCHA = true; ENABLE_CAPTCHA = true;
CAPTCHA_TYPE = "cfturnstile"; CAPTCHA_TYPE = "cfturnstile";
CF_TURNSTILE_SITEKEY = "0x4AAAAAAAaemJiXmRluMxbQ"; CF_TURNSTILE_SITEKEY = "0x4AAAAAAAaemJiXmRluMxbQ";
@ -63,15 +58,6 @@ in
ENABLED = true; ENABLED = true;
}; };
mailer = {
ENABLED = true;
FROM = "\"uku's forge\" <services@uku3lig.net>";
PROTOCOL = "smtps";
SMTP_ADDR = "mx1.uku3lig.net";
SMTP_PORT = 465;
USER = "services@uku3lig.net";
};
actions = { actions = {
ENABLED = true; ENABLED = true;
DEFAULT_ACTIONS_URL = "https://github.com"; DEFAULT_ACTIONS_URL = "https://github.com";

8
systems/etna/vaultwarden.nix
View file

@ -22,10 +22,10 @@ in
ROCKET_ADDRESS = "::1"; ROCKET_ADDRESS = "::1";
ROCKET_PORT = 8222; ROCKET_PORT = 8222;
SMTP_HOST = "mx1.uku3lig.net"; SMTP_HOST = "in-v3.mailjet.com";
SMTP_FROM = "services@uku3lig.net"; SMTP_FROM = "vaultwarden@uku3lig.net";
SMTP_PORT = 465; SMTP_PORT = 587;
SMTP_SECURITY = "force_tls"; SMTP_SECURITY = "starttls";
}; };
}; };
} }