Some Changes
This commit is contained in:
parent
f9431439d0
commit
1d3ca2a682
16 changed files with 19 additions and 28 deletions
|
@ -44,7 +44,7 @@ with lib;
|
||||||
|
|
||||||
services.nginx.package = pkgs.nginxMainline;
|
services.nginx.package = pkgs.nginxMainline;
|
||||||
services.nginx.virtualHosts."${config.networking.hostName}.private" = {
|
services.nginx.virtualHosts."${config.networking.hostName}.private" = {
|
||||||
default = true;
|
default = lib.mkDefault true;
|
||||||
locations."/" = {
|
locations."/" = {
|
||||||
root = pkgs.landingpage.override {
|
root = pkgs.landingpage.override {
|
||||||
jsonConfig = [
|
jsonConfig = [
|
||||||
|
|
|
@ -11,6 +11,8 @@ with lib;
|
||||||
ipcalc
|
ipcalc
|
||||||
|
|
||||||
units
|
units
|
||||||
|
|
||||||
|
parallel
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
(mkIf config.gui.enable {
|
(mkIf config.gui.enable {
|
||||||
|
@ -24,9 +26,11 @@ with lib;
|
||||||
aspellDicts.en
|
aspellDicts.en
|
||||||
aspellDicts.es
|
aspellDicts.es
|
||||||
|
|
||||||
joplin-desktop
|
#joplin-desktop
|
||||||
|
|
||||||
evince
|
evince
|
||||||
|
|
||||||
|
transmission-remote-gtk
|
||||||
];
|
];
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
let
|
let
|
||||||
interface = "wlp170s0";
|
interface = "wlp170s0";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
networking.networkmanager.ensureProfiles.profiles = {
|
networking.networkmanager.ensureProfiles.profiles = {
|
||||||
|
|
|
@ -23,7 +23,7 @@ in
|
||||||
|
|
||||||
services.dendrite = {
|
services.dendrite = {
|
||||||
enable = true;
|
enable = true;
|
||||||
httpPort = 8043;
|
httpPort = 8448;
|
||||||
settings = {
|
settings = {
|
||||||
global = {
|
global = {
|
||||||
server_name = "terranix.org";
|
server_name = "terranix.org";
|
||||||
|
@ -100,10 +100,11 @@ in
|
||||||
locations."/".root = element-web-terranix.org;
|
locations."/".root = element-web-terranix.org;
|
||||||
};
|
};
|
||||||
|
|
||||||
services.nginx.virtualHosts.${server_name} = {
|
#services.nginx.virtualHosts.${server_name} = {
|
||||||
locations."= /.well-known/matrix/server".alias =
|
# locations."= /.well-known/matrix/server".alias =
|
||||||
pkgs.writeText "matrix-server" (builtins.toJSON { "m.server" = "${nginx-vhost}:443"; });
|
# pkgs.writeText "matrix-server" (builtins.toJSON { "m.server" = "${nginx-vhost}:443"; });
|
||||||
locations."= /.well-known/matrix/client".alias =
|
# locations."= /.well-known/matrix/client".alias =
|
||||||
pkgs.writeText "matrix-client" (builtins.toJSON { "m.homeserver".base_url = "https://${nginx-vhost}"; });
|
# pkgs.writeText "matrix-client" (builtins.toJSON { "m.homeserver".base_url = "https://${nginx-vhost}"; });
|
||||||
};
|
#};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ lib, config, pkgs, ... }: {
|
{ lib, config, pkgs, ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
|
|
||||||
../../system/all/nginx.nix
|
# ../../system/all/nginx.nix
|
||||||
../../system/all/borg-jobs.nix
|
../../system/all/borg-jobs.nix
|
||||||
../../system/all/defaults.nix
|
../../system/all/defaults.nix
|
||||||
../../system/server/packages.nix
|
../../system/server/packages.nix
|
||||||
|
@ -12,8 +12,6 @@
|
||||||
|
|
||||||
./hetzner.nix
|
./hetzner.nix
|
||||||
|
|
||||||
#./screeps.nix
|
|
||||||
|
|
||||||
./borg.nix
|
./borg.nix
|
||||||
./codimd.nix
|
./codimd.nix
|
||||||
./gitea.nix
|
./gitea.nix
|
||||||
|
@ -33,24 +31,9 @@
|
||||||
./media-transmission.nix
|
./media-transmission.nix
|
||||||
./media-transmission2.nix
|
./media-transmission2.nix
|
||||||
./media-arr.nix
|
./media-arr.nix
|
||||||
#./media-tdarr.nix
|
|
||||||
#./media-unmanic.nix
|
|
||||||
|
|
||||||
./social-jitsi.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
|
# matrix
|
||||||
./terranix-dendrite.nix
|
./terranix-dendrite.nix
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,10 @@ in
|
||||||
recommendedProxySettings = true;
|
recommendedProxySettings = true;
|
||||||
virtualHosts = {
|
virtualHosts = {
|
||||||
|
|
||||||
|
"${config.networking.hostName}.private".default = false;
|
||||||
|
|
||||||
"ingolf-wagner.de" = {
|
"ingolf-wagner.de" = {
|
||||||
|
default = true;
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
extraConfig = error.extraConfig;
|
extraConfig = error.extraConfig;
|
||||||
|
|
Loading…
Reference in a new issue