Jimbo/nixos-config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Jimbo:b948ee3740e5a67b99b7c45807ce501cb762f1c8
Branches Tags
Jimbo:main
...
compare: Jimbo:6a4fce5a37a0a382a5e68283f4e8fe232344b998
Branches Tags
Jimbo:main

2 commits
b948ee3740 ... 6a4fce5a37

Author SHA1 Message Date
Jimbo 6a4fce5a37 Fix matrix 2025-01-02 00:43:00 -05:00
Jimbo 872abb1522 Remove lemmy, wasn't using it 2025-01-01 23:14:44 -05:00
12 changed files with 47 additions and 66 deletions
Show stats Expand all files Collapse all files

4
modules/system/services/server/forgejo/default.nix
View file

@ -7,8 +7,8 @@
enable = true;
settings = {
server = {
DOMAIN = "git.${config.domains.p1}";
ROOT_URL = "https://git.${config.domains.p1}:443";
DOMAIN = "git.${config.domains.p2}";
ROOT_URL = "https://git.${config.domains.p2}:443";
HTTP_PORT = 3110;
SSH_PORT = 2299;
START_SSH_SERVER = true;

2
modules/system/services/server/forgejo/nginx/default.nix
View file

@ -1,6 +1,6 @@
{ lib, config, ... }:
{
services.nginx.virtualHosts."git.${config.domains.p1}" = lib.mkIf config.services.forgejo.enable {
services.nginx.virtualHosts."git.${config.domains.p2}" = lib.mkIf config.services.forgejo.enable {
enableACME = true;
forceSSL = true;
locations."/" = {

1
modules/system/services/server/nginx/virtualhosts/default.nix
View file

@ -1,6 +1,7 @@
{ ... }:
{
imports = [
./p1
./p2
];
}

26
modules/system/services/server/nginx/virtualhosts/p1/default.nix Normal file
View file

@ -0,0 +1,26 @@
{ config, lib, ... }:
{
services.nginx.virtualHosts."${config.domains.p1}" = lib.mkIf config.system.server.enable {
enableACME = true;
addSSL = true;
locations = {
"/.well-known/matrix/client".extraConfig = ''
default_type application/json;
return 200 '
{
"m.homeserver": {
"base_url": "https://matrix.${config.domains.p1}"
},
"m.identity_server": {
"base_url": "https://matrix.org"
}
}
';
'';
"/.well-known/matrix/server".extraConfig = ''
default_type application/json;
return 200 '{ "m.server": "matrix.${config.domains.p1}:443" }';
'';
};
};
}

23
modules/system/services/server/nginx/virtualhosts/p2/default.nix
View file

@ -4,28 +4,5 @@
enableACME = true;
addSSL = true;
root = "/var/www/landing-page";
locations = {
"/.well-known/matrix/client".extraConfig = ''
default_type application/json;
return 200 '
{
"m.homeserver": {
"base_url": "https://matrix.${config.domains.p2}"
},
"m.identity_server": {
"base_url": "https://matrix.org"
},
"org.matrix.msc3575.proxy": {
"url": "https://matrix.${config.domains.p2}"
}
}
';
'';
"/.well-known/matrix/server".extraConfig = ''
default_type application/json;
return 200 '{ "m.server": "matrix.${config.domains.p2}:443" }';
'';
};
};
}

1
modules/system/services/server/social/default.nix
View file

@ -1,7 +1,6 @@
{ ... }:
{
imports = [
./lemmy
./mastodon
./matrix
./owncast

20
modules/system/services/server/social/lemmy/default.nix
View file

@ -1,20 +0,0 @@
{ config, ... }:
{
imports = [ ./nginx ];
services.lemmy = {
enable = config.system.server.enable;
nginx.enable = true;
database.createLocally = true;
settings = {
hostname = "lemmy.${config.domains.p1}";
email = {
smtp_server = "mx.${config.domains.p1}:587";
smtp_login = "noreply@${config.domains.p1}";
smtp_from_address = "NixFox Lemmy <noreply@${config.domains.p1}>";
smtp_password = config.secrets.noreplyPassword;
tls_type = "starttls";
};
};
};
}

7
modules/system/services/server/social/lemmy/nginx/default.nix
View file

@ -1,7 +0,0 @@
{ config, lib, ... }:
{
services.nginx.virtualHosts."lemmy.${config.domains.p1}" = lib.mkIf config.services.lemmy.enable {
enableACME = true;
forceSSL = true;
};
}

2
modules/system/services/server/social/matrix/element/nginx/default.nix
View file

@ -1,6 +1,6 @@
{ pkgs, config, lib, ... }:
{
services.nginx.virtualHosts."chat.${config.domains.p1}" = lib.mkIf config.services.matrix-synapse.enable {
services.nginx.virtualHosts."chat.${config.domains.p2}" = lib.mkIf config.services.matrix-synapse.enable {
enableACME = true;
addSSL = true;
root = "${pkgs.element-web}";

18
modules/system/services/server/social/matrix/synapse/default.nix
View file

@ -1,5 +1,9 @@
{ pkgs, config, ... }:
{
imports = [
./nginx
];
services.matrix-synapse = {
enable = config.system.server.enable;
settings = {
@ -11,7 +15,13 @@
{
port = 8008;
bind_addresses = [ "::" "0.0.0.0" ];
resources = [ { compress = true; names = [ "client" "federation" ]; } ];
resources = [{
compress = true;
names = [
"client"
"federation"
];
}];
type = "http";
tls = false;
x_forwarded = true;
@ -19,7 +29,7 @@
];
email = {
notif_from = "Jimbo's Matrix <noreply@${config.domains.p1}>";
notif_from = "NixFox Matrix <noreply@${config.domains.p1}>";
smtp_host = "mx.${config.domains.p1}";
smtp_user = "noreply@${config.domains.p1}";
smtp_pass = config.secrets.noreplyPassword;
@ -33,10 +43,6 @@
# Allow only this range of emails
allowed_local_3pids = [
{
medium = "email";
pattern = ''^[^@]+@jimbosfiles\.com$'';
}
{
medium = "email";
pattern = ''^[^@]+@nixfox\.ca$'';

7
modules/system/services/server/social/matrix/synapse/nginx/default.nix
View file

@ -1,13 +1,12 @@
{ config, ... }:
{ config, lib, ... }:
{
services.nginx.virtualHosts."matrix.${config.domains.p1}" = {
services.nginx.virtualHosts."matrix.${config.domains.p1}" = lib.mkIf config.services.matrix-synapse.enable {
enableACME = true;
forceSSL = true;
locations = {
"/".extraConfig = ''return 403;'';
"/client".proxyPass = "http://127.0.0.1:8009";
"/client".proxyPass = "http://127.0.0.1:8008";
"/_matrix".proxyPass = "http://127.0.0.1:8008";
"/_matrix/client/unstable/org.matrix.msc3575/sync".proxyPass = "http://127.0.0.1:8009";
"/_synapse/client".proxyPass = "http://127.0.0.1:8008";
};
};

2
modules/system/services/server/social/owncast/nginx/default.nix
View file

@ -1,6 +1,6 @@
{ config, lib, ... }:
{
services.nginx.virtualHosts."live.${config.domains.p1}" = lib.mkIf config.services.owncast.enable {
services.nginx.virtualHosts."live.${config.domains.p2}" = lib.mkIf config.services.owncast.enable {
enableACME = true;
forceSSL = true;
locations."/" = {