Update a lot of options, simplify variables, replace options with tags
This commit is contained in:
parent
dbc0ab6dd3
commit
7667ef9a1b
147 changed files with 663 additions and 928 deletions
|
@ -12,7 +12,7 @@
|
|||
max-port = 50000;
|
||||
use-auth-secret = true;
|
||||
static-auth-secret = config.secrets.coturnSecret;
|
||||
realm = "turn.nixfox.ca";
|
||||
realm = "turn.${config.vars.mainDomain}";
|
||||
cert = "/var/lib/acme/${config.services.coturn.realm}/fullchain.pem";
|
||||
pkey = "/var/lib/acme/${config.services.coturn.realm}/key.pem";
|
||||
};
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ config, lib, ... }:
|
||||
{
|
||||
config = lib.mkIf config.services.coturn.enable {
|
||||
services.nginx.virtualHosts."turn.nixfox.ca" = {
|
||||
services.nginx.virtualHosts."turn.${config.vars.mainDomain}" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
listen = [{
|
||||
|
@ -12,11 +12,9 @@
|
|||
locations."/".proxyPass = "http://127.0.0.1:1380";
|
||||
};
|
||||
|
||||
security.acme.certs = {
|
||||
"turn.nixfox.ca" = {
|
||||
group = "turnserver";
|
||||
postRun = "systemctl restart coturn.service";
|
||||
};
|
||||
security.acme.certs."turn.${config.vars.mainDomain}" = {
|
||||
group = "turnserver";
|
||||
postRun = "systemctl restart coturn.service";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -4,14 +4,14 @@
|
|||
|
||||
nixpkgs.config.element-web.conf = {
|
||||
default_server_config."m.homeserver" = {
|
||||
base_url = "https://matrix.nixfox.ca";
|
||||
server_name = "matrix.nixfox.ca";
|
||||
base_url = "https://matrix.${config.vars.mainDomain}";
|
||||
server_name = "matrix.${config.vars.mainDomain}";
|
||||
};
|
||||
branding = {
|
||||
auth_header_logo_url = "https://www.nixfox.ca/images/copyright/profile.png";
|
||||
#welcome_background_url = "https://www.nixfox.ca/images/backgrounds/template-background.png";
|
||||
auth_header_logo_url = "https://www.${config.vars.mainDomain}/images/copyright/profile.png";
|
||||
#welcome_background_url = "https://www.${config.vars.mainDomain}/images/backgrounds/template-background.png";
|
||||
};
|
||||
embedded_pages.home_url = "https://www.nixfox.ca/";
|
||||
embedded_pages.home_url = "https://www.${config.vars.mainDomain}/";
|
||||
disable_custom_urls = true;
|
||||
disable_guests = true;
|
||||
default_theme = "dark";
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
services.nginx.virtualHosts."chat.nixfox.ca" = lib.mkIf config.services.matrix-synapse.enable {
|
||||
services.nginx.virtualHosts."chat.${config.vars.mainDomain}" = lib.mkIf config.services.matrix-synapse.enable {
|
||||
enableACME = true;
|
||||
addSSL = true;
|
||||
root = "${pkgs.element-web}";
|
||||
|
|
|
@ -5,15 +5,15 @@
|
|||
config = lib.mkIf config.services.matrix-synapse.enable {
|
||||
services.matrix-synapse = {
|
||||
settings = {
|
||||
server_name = "nixfox.ca";
|
||||
public_baseurl = "https://matrix.nixfox.ca";
|
||||
server_name = "${config.vars.mainDomain}";
|
||||
public_baseurl = "https://matrix.${config.vars.mainDomain}";
|
||||
suppress_key_server_warning = true;
|
||||
|
||||
# Email notifications about account status
|
||||
email = {
|
||||
notif_from = "NixFox Matrix <noreply@nixfox.ca>";
|
||||
smtp_host = "mx.nixfox.ca";
|
||||
smtp_user = "noreply@nixfox.ca";
|
||||
notif_from = "NixFox Matrix <noreply@${config.vars.mainDomain}>";
|
||||
smtp_host = "mx.${config.vars.mainDomain}";
|
||||
smtp_user = "noreply@${config.vars.mainDomain}";
|
||||
smtp_pass = config.secrets.mailPass.nixfoxNoReply;
|
||||
enable_tls = true;
|
||||
smtp_port = 587;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ config, lib, ... }:
|
||||
{
|
||||
services.nginx.virtualHosts."matrix.nixfox.ca" = lib.mkIf config.services.matrix-synapse.enable {
|
||||
services.nginx.virtualHosts."matrix.${config.vars.mainDomain}" = lib.mkIf config.services.matrix-synapse.enable {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
locations = {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue