c3d2/nix-config
c3d2
/
nix-config
24
7
Fork 3
Code Issues 12 Pull Requests 2 Releases Wiki Activity

Merge leon's branch

This commit is contained in:
Astro 2022-11-28 00:49:52 +01:00
parent 18d0694b10 4f785ca1c9
commit b3caf1a39b
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hosts/leon/default.nix
View File

@ -52,12 +52,11 @@
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget
environment.systemPackages = with pkgs; [ 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; virtualisation.docker.enable = true;
users.users.leon = { users.users.leon = {
isNormalUser = true; isNormalUser = true;
extraGroups = [ "wheel" "docker" ]; extraGroups = [ "wheel" "docker" ];
@ -204,11 +203,11 @@ networking.wireguard.interfaces = {
proxyWebsockets = true; proxyWebsockets = true;
}; };
}; };
virtualHosts."cloud.bicospacetech.c3d2.de" = { virtualHosts."bicospacetech.cloud.c3d2.de" = {
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;
locations."/" = { locations."/" = {
proxyPass = "http://10.10.11.2:2500"; proxyPass = "http://10.10.11.4:80";
proxyWebsockets = true; proxyWebsockets = true;
}; };
}; };

8
hosts/leoncloud/default.nix
View File

@ -9,7 +9,6 @@
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;
@ -29,6 +28,7 @@
vim vim
python3Full python3Full
python310Packages.pip python310Packages.pip
python310Packages.flask
nmap nmap
htop htop
wireguard-tools wireguard-tools
@ -41,7 +41,7 @@
createHome = true; createHome = true;
openssh.authorizedKeys.keys = with import ../../users.nix; openssh.authorizedKeys.keys = with import ../../users.nix;
leon.sshKeys; leon.sshKeys;
}; };
# enable IP routing # enable IP routing
@ -89,7 +89,7 @@ services.nextcloud = {
dbname = "nextcloud"; dbname = "nextcloud";
adminpassFile = "/etc/nixos/next-cloud/pass"; adminpassFile = "/etc/nixos/next-cloud/pass";
adminuser = "root"; 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"]; 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---------------------- #<-----------------nextcloud----------------------