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