v/infrastructure
1
0
Fork 0
Code Issues 13 Pull requests 1 Actions Packages Projects Releases Activity

minor updates

Browse source
This commit is contained in:
Vivian 2022-03-31 12:25:45 +02:00
parent 4e80154467
commit 48a11eaa32
6 changed files with 44 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
flake.lock
View file

@ -7,11 +7,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1638665590, "lastModified": 1648475189,
"narHash": "sha256-nhtfL3z4TizWHemyZvgLvq11FhYX5Ya4ke+t6Np5PKQ=", "narHash": "sha256-gAGAS6IagwoUr1B0ohE3iR6sZ8hP4LSqzYLC8Mq3WGU=",
"owner": "serokell", "owner": "serokell",
"repo": "deploy-rs", "repo": "deploy-rs",
"rev": "715e92a13018bc1745fb680b5860af0c5641026a", "rev": "83e0c78291cd08cb827ba0d553ad9158ae5a95c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -23,11 +23,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1627913399, "lastModified": 1648199409,
"narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -180,11 +180,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1632086102, "lastModified": 1648219316,
"narHash": "sha256-wVTcf0UclFS+zHtfPToB13jIO7n0U9N50MuRbPjQViE=", "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e0ce3c683ae677cf5aab597d645520cddd13392b", "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -196,16 +196,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1638918949, "lastModified": 1648632716,
"narHash": "sha256-HDAM4N7dBB0zVgoflnWyVDrGx4oiIUaEjI8YDwk0FFU=", "narHash": "sha256-kCmnDeiaMsdhfnNKjxdOzwRh2H6eQb8yWAL+nNabC/Y=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4d07862ea6ed637ee85f868d1bf8a833878bc05e", "rev": "710fed5a2483f945b14f4a58af2cd3676b42d8c8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable-small", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -285,11 +285,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1638383949, "lastModified": 1644387507,
"narHash": "sha256-k7oMUrp1cMBj59uihyocJVqi4jbU16ycHQqGTJxH1b0=", "narHash": "sha256-PX1sWtet0N0s83SKdZVR0zFJ1CiN86Cw/IEeQe1s4MY=",
"owner": "serokell", "owner": "serokell",
"repo": "serokell.nix", "repo": "serokell.nix",
"rev": "faebe5b14155d045ae5d3f76193c8e99e664af1b", "rev": "e40718ac932e7c629c5f863ed27c72d516dc1356",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -300,11 +300,11 @@
}, },
"utils": { "utils": {
"locked": { "locked": {
"lastModified": 1631561581, "lastModified": 1648297722,
"narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -7,7 +7,7 @@
inputs = { inputs = {
deploy-rs.url = "github:serokell/deploy-rs"; deploy-rs.url = "github:serokell/deploy-rs";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
serokell-nix.url = "github:serokell/serokell.nix"; serokell-nix.url = "github:serokell/serokell.nix";
vault-secrets.url = "github:serokell/vault-secrets"; vault-secrets.url = "github:serokell/vault-secrets";
}; };

6
hosts.nix
View file

@ -97,6 +97,12 @@
ip = "10.42.42.20"; ip = "10.42.42.20";
mac = "1A:88:A0:B0:65:B4"; mac = "1A:88:A0:B0:65:B4";
} }
{
hostname = "zmeura";
ip = "10.42.42.24";
mac = "b8:27:eb:d5:e0:f5";
nix = false;
}
{ {
hostname = "nuc"; hostname = "nuc";
ip = "10.42.42.42"; ip = "10.42.42.42";

28
nixos/common/default.nix
View file

@ -17,20 +17,22 @@
# Nix Settings # Nix Settings
nix = { nix = {
package = pkgs.nixUnstable; package = pkgs.nixUnstable;
autoOptimiseStore = true; settings = {
binaryCaches = [ auto-optimise-store = true;
"https://cachix.cachix.org" trusted-users = [ "root" "victor" ];
"https://nix-community.cachix.org" substituters = [
"https://nixpkgs-review-bot.cachix.org" "https://cachix.cachix.org"
]; "https://nix-community.cachix.org"
binaryCachePublicKeys = [ "https://nixpkgs-review-bot.cachix.org"
"cachix.cachix.org-1:eWNHQldwUO7G2VkjpnjDbWwy4KQ/HNxht7H4SSoMckM=" ];
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" trusted-public-keys = [
"nixpkgs-review-bot.cachix.org-1:eppgiDjPk7Hkzzz7XlUesk3rcEHqNDozGOrcLc8IqwE=" "cachix.cachix.org-1:eWNHQldwUO7G2VkjpnjDbWwy4KQ/HNxht7H4SSoMckM="
]; "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
trustedUsers = [ "root" "victor" ]; "nixpkgs-review-bot.cachix.org-1:eppgiDjPk7Hkzzz7XlUesk3rcEHqNDozGOrcLc8IqwE="
];
};
extraOptions = '' extraOptions = ''
experimental-features = nix-command flakes ca-references experimental-features = nix-command flakes
''; '';
}; };

4
nixos/hosts/nginx/configuration.nix
View file

@ -8,7 +8,7 @@ let
proxyWebsockets = true; proxyWebsockets = true;
}; };
}; };
k8s_proxy = proxy "http://10.42.42.10:8000/"; k8s_proxy = proxy "http://10.42.42.150:8000/";
in { in {
networking.hostName = "nginx"; networking.hostName = "nginx";
@ -42,7 +42,7 @@ in {
virtualHosts."whoami.wooloofan.club" = k8s_proxy; virtualHosts."whoami.wooloofan.club" = k8s_proxy;
}; };
security.acme.email = "victorheld12@gmail.com"; security.acme.defaults.email = "victorheld12@gmail.com";
security.acme.acceptTerms = true; security.acme.acceptTerms = true;
security.acme.preliminarySelfsigned = true; security.acme.preliminarySelfsigned = true;
} }

2
nixos/hosts/unifi/configuration.nix
View file

@ -26,7 +26,7 @@
services.unifi = { services.unifi = {
enable = true; enable = true;
openPorts = true;
unifiPackage = pkgs.unifi; unifiPackage = pkgs.unifi;
openFirewall = true;
}; };
} }