Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix wry ip

Browse Source
This commit is contained in:
makefu 2015-10-01 18:48:41 +02:00
parent e1ec3ff1ef
commit 4d5bfae7b2
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
krebs/3modules/default.nix
View File

@ -428,6 +428,7 @@ let
wry = rec { wry = rec {
cores = 1; cores = 1;
dc = "makefu"; #dc = "cac"; dc = "makefu"; #dc = "cac";
infest.addr = "${head nets.internet.addrs4}";
extraZones = { extraZones = {
"krebsco.de" = '' "krebsco.de" = ''
wry IN A ${head nets.internet.addrs4} wry IN A ${head nets.internet.addrs4}
@ -435,7 +436,7 @@ let
}; };
nets = rec { nets = rec {
internet = { internet = {
addrs4 = ["162.219.7.216"]; addrs4 = ["104.233.87.86"];
aliases = [ aliases = [
"wry.internet" "wry.internet"
]; ];

16
krebs/Zhosts/wry Normal file
View File

@ -0,0 +1,16 @@
Address = 104.233.87.86
Subnet = 10.243.29.169
Subnet = 42:6e1e:cc8a:7cef:827:f938:8c64:baad
-----BEGIN RSA PUBLIC KEY-----
MIICCgKCAgEAs9bq++H4HF8EpZMfWGfoIsh/C+YNO2pg74UPBsP/tFFe71yzWwUn
U9LW0n3bBqCMQ/oDthbSMwCkS9JzcUi22QJEdjbQs/aay9gZR115b+UxWPocw0Ms
ZoREKo3Oe0hETk7Ing8NdBDI0kCBh9QnvqQ3iKd0rBae3DYvcWlDsY93GLGMddgA
7E9oa3EHVYH/MPZaeJtTknaJduanBSbiEb/xQOqxTadHoQASKU6DQD1czMH3hLG2
8Wn4MBj9fgKBAoIy092tIzPtE2QwAHO73yz4mSW/3r190hREgVbjuEPiw4w5mEyQ
j+NeN3f3heFKx+GCgdWH9xPw6m6qPdqUiGUPq91KXMOhNa8lLcTp95mHdCMesZCF
TFj7hf6y+SVt17Vo+YUL7UqnMtAm3eZZmwyDu0DfKFrdgz6MtDD+5dQp9g8VHpqw
RfbaB1Srlr24EUYYoOBEF9CcIacFbsr+MKh+hQk5R0uEMSeAWARzxvvr69iMgdEC
zDiu0rrRLN+CrfgkDir7pkRKxeA1lz8KpySyIZRziNg6mSHjKjih4++Bbu4N2ack
86h84qBrA8lq2xsub4+HgKZGH2l5Y8tvlr+rx0mQKEJkT6XDKCXZFPfl2N0QrWGT
Dv7l2vn0QMj9E6+BdRhYaO/m3+cIZ9faM851nRj/gq2OOtzW3ekrne0CAwEAAQ==
-----END RSA PUBLIC KEY-----

9
makefu/1systems/wry.nix
View File

@ -2,11 +2,12 @@
let let
ip = (lib.elemAt config.krebs.build.host.nets.internet.addrs4 0); ip = (lib.head config.krebs.build.host.nets.internet.addrs4);
in { in {
imports = [ imports = [
../../tv/2configs/CAC-CentOS-7-64bit.nix ../../tv/2configs/CAC-CentOS-7-64bit.nix
../2configs/base.nix ../2configs/base.nix
../2configs/base-sources.nix
../2configs/tinc-basic-retiolum.nix ../2configs/tinc-basic-retiolum.nix
{ {
} }
@ -18,13 +19,17 @@ in {
prefixLength = 24; prefixLength = 24;
} }
]; ];
networking.defaultGateway = "104.233.80.1"; networking.defaultGateway = "104.233.87.1";
networking.nameservers = [ networking.nameservers = [
"8.8.8.8" "8.8.8.8"
]; ];
# based on ../../tv/2configs/CAC-Developer-2.nix # based on ../../tv/2configs/CAC-Developer-2.nix
sound.enable = false; sound.enable = false;
# prepare graphs
nixpkgs.config.packageOverrides = pkgs: { tinc = pkgs.tinc_pre; };
krebs.build = { krebs.build = {
user = config.krebs.users.makefu; user = config.krebs.users.makefu;
target = "root@${ip}"; target = "root@${ip}";