Merge leon's branch
This commit is contained in:
commit
c61bb308a3
|
@ -25,8 +25,8 @@
|
||||||
# ' / `-----'' / |
|
# ' / `-----'' / |
|
||||||
# `...-' `...-'
|
# `...-' `...-'
|
||||||
#--------------------------------------------------------------------------------
|
#--------------------------------------------------------------------------------
|
||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
|
{ config, lib, pkgs, ... }:
|
||||||
{
|
{
|
||||||
deployment = {
|
deployment = {
|
||||||
persistedShares = [ "/etc" "/home" "/var" ];
|
persistedShares = [ "/etc" "/home" "/var" ];
|
||||||
|
@ -208,7 +208,7 @@ networking.wireguard.interfaces = {
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
locations."/" = {
|
locations."/" = {
|
||||||
proxyPass = "http://10.10.11.2:2500";
|
proxyPass = "http://10.10.11.2:2500";
|
||||||
proxyWebsockets = true;
|
proxyWebsockets = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
|
|
||||||
nix.settings.auto-optimise-store = lib.mkForce false;
|
nix.settings.auto-optimise-store = lib.mkForce false;
|
||||||
|
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
hostName = "leoncloud";
|
hostName = "leoncloud";
|
||||||
firewall.enable = true;
|
firewall.enable = true;
|
||||||
|
@ -65,7 +66,7 @@
|
||||||
privateKeyFile = "/etc/nixos/wireguard-keys/private-key";
|
privateKeyFile = "/etc/nixos/wireguard-keys/private-key";
|
||||||
peers = [
|
peers = [
|
||||||
{
|
{
|
||||||
publicKey = "w3qegSSuqFTFrGk4XJaWBSwGDOiqbnnAIR9MzwjYVA8=";
|
publicKey = "iEVq4lvvKFfqjcoYYyNkA0MS8rcSGaDfPwQGN3C7+D0=";
|
||||||
allowedIPs = [ "10.10.11.0/24" ];
|
allowedIPs = [ "10.10.11.0/24" ];
|
||||||
endpoint = "45.158.40.162:18900";
|
endpoint = "45.158.40.162:18900";
|
||||||
persistentKeepalive = 25;
|
persistentKeepalive = 25;
|
||||||
|
@ -109,7 +110,25 @@ services.nextcloud = {
|
||||||
after = ["postgresql.service"];
|
after = ["postgresql.service"];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
services.nginx.virtualHosts."localhost".listen = [ { addr = "127.0.0.1"; port = 8080; } ];
|
||||||
|
|
||||||
|
|
||||||
#<-----------------nextcloud----------------------
|
#<-----------------nextcloud----------------------
|
||||||
|
#-----------------------------ngin-X--------------------------------
|
||||||
|
|
||||||
|
# services.nginx = {
|
||||||
|
# enable = true;
|
||||||
|
|
||||||
|
# virtualHosts."bicospacetech.c3d2.de" = {
|
||||||
|
# forceSSL = true;
|
||||||
|
# enableACME = true;
|
||||||
|
# locations."/" = {
|
||||||
|
# proxyPass = "http://45.158.40.162:12000";
|
||||||
|
# proxyWebsockets = true;
|
||||||
|
# };
|
||||||
|
|
||||||
|
#};
|
||||||
|
#-----------------------------ngin-X--------------------------------
|
||||||
|
|
||||||
system.stateVersion = "22.05";
|
system.stateVersion = "22.05";
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue