Merge leon's branch
This commit is contained in:
commit
b3caf1a39b
|
@ -52,12 +52,11 @@
|
|||
# List packages installed in system profile. To search, run:
|
||||
# $ nix search wget
|
||||
environment.systemPackages = with pkgs; [
|
||||
wget vim python3Full python310Packages.pip nmap htop wireguard-tools docker-compose
|
||||
wget vim python3Full python310Packages.pip python310Packages.flask nmap htop wireguard-tools docker-compose
|
||||
];
|
||||
|
||||
virtualisation.docker.enable = true;
|
||||
|
||||
|
||||
users.users.leon = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" "docker" ];
|
||||
|
@ -204,11 +203,11 @@ networking.wireguard.interfaces = {
|
|||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
virtualHosts."cloud.bicospacetech.c3d2.de" = {
|
||||
virtualHosts."bicospacetech.cloud.c3d2.de" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://10.10.11.2:2500";
|
||||
proxyPass = "http://10.10.11.4:80";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
|
||||
nix.settings.auto-optimise-store = lib.mkForce false;
|
||||
|
||||
|
||||
networking = {
|
||||
hostName = "leoncloud";
|
||||
firewall.enable = true;
|
||||
|
@ -29,6 +28,7 @@
|
|||
vim
|
||||
python3Full
|
||||
python310Packages.pip
|
||||
python310Packages.flask
|
||||
nmap
|
||||
htop
|
||||
wireguard-tools
|
||||
|
@ -41,7 +41,7 @@
|
|||
createHome = true;
|
||||
openssh.authorizedKeys.keys = with import ../../users.nix;
|
||||
leon.sshKeys;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
# enable IP routing
|
||||
|
@ -89,7 +89,7 @@ services.nextcloud = {
|
|||
dbname = "nextcloud";
|
||||
adminpassFile = "/etc/nixos/next-cloud/pass";
|
||||
adminuser = "root";
|
||||
extraTrustedDomains = ["45.158.40.165" "172.20.79.254" "10.10.11.4" "10.10.11.1" ];
|
||||
extraTrustedDomains = ["10.10.11.4" "10.10.11.1" "bicospacetech.cloud.c3d2.de"];
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -110,7 +110,7 @@ services.nextcloud = {
|
|||
after = ["postgresql.service"];
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts."localhost".listen = [ { addr = "127.0.0.1"; port = 8080; } ];
|
||||
# services.nginx.virtualHosts."localhost".listen = [ { addr = "127.0.0.1"; port = 8080; } ];
|
||||
|
||||
|
||||
#<-----------------nextcloud----------------------
|
||||
|
|
Loading…
Reference in New Issue