Some Changes

This commit is contained in:
Ingolf Wagner 2024-01-02 03:22:41 +01:00
parent f9431439d0
commit 1d3ca2a682
Signed by: palo
GPG key ID: 76BF5F1928B9618B
16 changed files with 19 additions and 28 deletions

View file

@ -44,7 +44,7 @@ with lib;
services.nginx.package = pkgs.nginxMainline;
services.nginx.virtualHosts."${config.networking.hostName}.private" = {
default = true;
default = lib.mkDefault true;
locations."/" = {
root = pkgs.landingpage.override {
jsonConfig = [

View file

@ -11,6 +11,8 @@ with lib;
ipcalc
units
parallel
];
}
(mkIf config.gui.enable {
@ -24,9 +26,11 @@ with lib;
aspellDicts.en
aspellDicts.es
joplin-desktop
#joplin-desktop
evince
transmission-remote-gtk
];
})
];

View file

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
let
interface = "wlp170s0";
interface = "wlp170s0";
in
{
networking.networkmanager.ensureProfiles.profiles = {

View file

@ -23,7 +23,7 @@ in
services.dendrite = {
enable = true;
httpPort = 8043;
httpPort = 8448;
settings = {
global = {
server_name = "terranix.org";
@ -100,10 +100,11 @@ in
locations."/".root = element-web-terranix.org;
};
services.nginx.virtualHosts.${server_name} = {
locations."= /.well-known/matrix/server".alias =
pkgs.writeText "matrix-server" (builtins.toJSON { "m.server" = "${nginx-vhost}:443"; });
locations."= /.well-known/matrix/client".alias =
pkgs.writeText "matrix-client" (builtins.toJSON { "m.homeserver".base_url = "https://${nginx-vhost}"; });
};
#services.nginx.virtualHosts.${server_name} = {
# locations."= /.well-known/matrix/server".alias =
# pkgs.writeText "matrix-server" (builtins.toJSON { "m.server" = "${nginx-vhost}:443"; });
# locations."= /.well-known/matrix/client".alias =
# pkgs.writeText "matrix-client" (builtins.toJSON { "m.homeserver".base_url = "https://${nginx-vhost}"; });
#};
}

View file

@ -1,7 +1,7 @@
{ lib, config, pkgs, ... }: {
imports = [
../../system/all/nginx.nix
# ../../system/all/nginx.nix
../../system/all/borg-jobs.nix
../../system/all/defaults.nix
../../system/server/packages.nix
@ -12,8 +12,6 @@
./hetzner.nix
#./screeps.nix
./borg.nix
./codimd.nix
./gitea.nix
@ -33,24 +31,9 @@
./media-transmission.nix
./media-transmission2.nix
./media-arr.nix
#./media-tdarr.nix
#./media-unmanic.nix
./social-jitsi.nix
#./webhook-ring.nix
#../../system/server
#./hardware-configuration.nix
#./finance.nix
#./graylog.nix
#./kibana.nix
#./mysql.nix
#./prometheus.nix
#./weechat.nix
#./property.nix # flask sucks, find something else
# matrix
./terranix-dendrite.nix

View file

@ -39,7 +39,10 @@ in
recommendedProxySettings = true;
virtualHosts = {
"${config.networking.hostName}.private".default = false;
"ingolf-wagner.de" = {
default = true;
forceSSL = true;
enableACME = true;
extraConfig = error.extraConfig;