mirror of
https://github.com/RGBCube/ncc
synced 2025-07-29 19:17:45 +00:00
fix: fix import graph and errors
This commit is contained in:
parent
f2ab446c48
commit
d8bcbab825
7 changed files with 29 additions and 21 deletions
|
@ -6,6 +6,8 @@
|
|||
|
||||
port = 8001;
|
||||
in {
|
||||
imports = [(self + /modules/nginx.nix)];
|
||||
|
||||
secrets.forgejoPasswordRunner = {
|
||||
file = ./password.runner.age;
|
||||
owner = "forgejo";
|
||||
|
@ -155,7 +157,7 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts.${fqdn} = merge config.nginx.sslTemplate {
|
||||
services.nginx.virtualHosts.${fqdn} = merge config.services.nginx.sslTemplate {
|
||||
locations."/".proxyPass = "http://[::1]:${toString port}";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -6,6 +6,8 @@
|
|||
|
||||
port = 8000;
|
||||
in {
|
||||
imports = [(self + /modules/nginx.nix)];
|
||||
|
||||
secrets.grafanaPassword = {
|
||||
file = ./password.age;
|
||||
owner = "grafana";
|
||||
|
@ -76,7 +78,7 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts.${fqdn} = merge config.nginx.sslTemplate {
|
||||
services.nginx.virtualHosts.${fqdn} = merge config.services.nginx.sslTemplate {
|
||||
locations."/" = {
|
||||
proxyPass = "http://[::1]:${toString port}";
|
||||
proxyWebsockets = true;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, ... }: let
|
||||
{ self, config, lib, ... }: let
|
||||
inherit (config.networking) domain;
|
||||
inherit (lib) const enabled genAttrs merge strings;
|
||||
|
||||
|
@ -35,6 +35,8 @@
|
|||
portSynapse = 8002;
|
||||
portSync = 8003;
|
||||
in {
|
||||
imports = [(self + /modules/nginx.nix)];
|
||||
|
||||
secrets.matrixSecret = {
|
||||
file = ./password.secret.age;
|
||||
owner = "matrix-synapse";
|
||||
|
@ -108,7 +110,7 @@ in {
|
|||
|
||||
services.nginx.virtualHosts.${domain} = configWellKnownResponse;
|
||||
|
||||
services.nginx.virtualHosts.${domainChat} = merge config.nginx.sslTemplate configWellKnownResponse configNotFoundLocation {
|
||||
services.nginx.virtualHosts.${domainChat} = merge config.services.nginx.sslTemplate configWellKnownResponse configNotFoundLocation {
|
||||
root = "${pathSite}";
|
||||
|
||||
locations."/_matrix".proxyPass = "http://[::1]:${toString portSynapse}";
|
||||
|
@ -124,7 +126,7 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts.${domainSync} = merge config.nginx.sslTemplate configNotFoundLocation {
|
||||
services.nginx.virtualHosts.${domainSync} = merge config.services.nginx.sslTemplate configNotFoundLocation {
|
||||
root = pathSite;
|
||||
|
||||
locations."~ ^/(client/|_matrix/client/unstable/org.matrix.msc3575/sync)"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, ... }: let
|
||||
{ self, config, lib, pkgs, ... }: let
|
||||
inherit (config.networking) domain;
|
||||
inherit (lib) const enabled genAttrs mkAfter;
|
||||
|
||||
|
@ -6,6 +6,8 @@
|
|||
|
||||
packageNextcloud = pkgs.nextcloud29;
|
||||
in {
|
||||
imports = [(self + /modules/nginx.nix)];
|
||||
|
||||
secrets.nextcloudPassword = {
|
||||
file = ./password.age;
|
||||
owner = "nextcloud";
|
||||
|
@ -114,5 +116,5 @@ in {
|
|||
nginx.recommendedHttpHeaders = true;
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts.${fqdn} = config.ngnixSslTemplate;
|
||||
services.nginx.virtualHosts.${fqdn} = config.services.nginx.sslTemplate;
|
||||
}
|
||||
|
|
|
@ -1,7 +1,3 @@
|
|||
{ self, ... }: {
|
||||
imports = [
|
||||
(self + /modules/acme)
|
||||
(self + /modules/nginx.nix)
|
||||
(self + /modules/site.nix)
|
||||
];
|
||||
imports = [(self + /modules/site.nix)];
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue