diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2015-07-02 20:56:24 +0200 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2015-07-02 20:56:24 +0200 |
commit | 6e4aff5269ef7677ddc23ccb498c130a0e1403a2 (patch) | |
tree | b54a3f56ccbe66dfe7d88c5f2d266a7affd65b59 /custom | |
parent | 17d901fdd0f0cbd6fddbca62bb4b4d835e9f059b (diff) | |
download | nixos-6e4aff5269ef7677ddc23ccb498c130a0e1403a2.tar nixos-6e4aff5269ef7677ddc23ccb498c130a0e1403a2.tar.gz nixos-6e4aff5269ef7677ddc23ccb498c130a0e1403a2.tar.bz2 nixos-6e4aff5269ef7677ddc23ccb498c130a0e1403a2.tar.xz nixos-6e4aff5269ef7677ddc23ccb498c130a0e1403a2.zip |
Moved tinc hosts to submodules
Diffstat (limited to 'custom')
-rwxr-xr-x | custom/tinc/generate_hostfile.hs | 2 | ||||
l---------[-rw-r--r--] | custom/tinc/laeradhr-hosts.nix | 93 | ||||
l---------[-rw-r--r--] | custom/tinc/yggdrasil-hosts.nix | 82 |
3 files changed, 3 insertions, 174 deletions
diff --git a/custom/tinc/generate_hostfile.hs b/custom/tinc/generate_hostfile.hs index a8420780..90fa11b7 100755 --- a/custom/tinc/generate_hostfile.hs +++ b/custom/tinc/generate_hostfile.hs | |||
@@ -12,7 +12,7 @@ genHostFile (_ :/ (Dir _ contents)) = "{\n" ++ entries ++ "\n}\n" | |||
12 | entries = concat [ genEntry name content | (File name content) <- contents, name `notElem` hidden ] | 12 | entries = concat [ genEntry name content | (File name content) <- contents, name `notElem` hidden ] |
13 | genEntry fileName fileContent = unlines . indent $ [ "\"" ++ fileName ++ "\" = ''" ] ++ indent (lines fileContent) ++ [ "'';" ] | 13 | genEntry fileName fileContent = unlines . indent $ [ "\"" ++ fileName ++ "\" = ''" ] ++ indent (lines fileContent) ++ [ "'';" ] |
14 | hidden = [ "to_nix.sh" | 14 | hidden = [ "to_nix.sh" |
15 | , "signup.sh" | 15 | , "hosts.nix" |
16 | ] | 16 | ] |
17 | 17 | ||
18 | indent :: [String] -> [String] | 18 | indent :: [String] -> [String] |
diff --git a/custom/tinc/laeradhr-hosts.nix b/custom/tinc/laeradhr-hosts.nix index 83b72899..e9de637e 100644..120000 --- a/custom/tinc/laeradhr-hosts.nix +++ b/custom/tinc/laeradhr-hosts.nix | |||
@@ -1,92 +1 @@ | |||
1 | { | ../../laeradhr/hosts.nix \ No newline at end of file | |
2 | "heimdallr" = '' | ||
3 | Subnet = 10.142.0.2 | ||
4 | Subnet = 10.141.1.0/24 | ||
5 | |||
6 | -----BEGIN RSA PUBLIC KEY----- | ||
7 | MIICCgKCAgEAzphcufJwioUu3I9120c7gimAC325metgKg3W8V3RfmRh2GWn/H+t | ||
8 | DvKRH3BwSTYrNnwNgyp60gY/XexVED0xCIDoGjWZsK2o60g5xA8fPAPckVaPP3Vj | ||
9 | a3gyN6Y2Tlb4Ef2uWNe8irPL928v6UgxGl9dlgG3G2hW19hfuBBziDFdQCtyR1FH | ||
10 | GKvpS2rgHHIljh51LRDN9G2eIv9FGVDmiAgUYKAgzhwOr+TIHOPshcgMYD0iZ86s | ||
11 | 7iXJzWaiNTzx35ZzV5lkt+DafAQcWYrSV6858PXbx5HihU+ugTF+mbLuFitWNuja | ||
12 | DIZayUszmK/OBP8Mz3DP+NjRJugBv3hozpjMnSDZLMl7NcbwEn6+mj4Rrk9yMGPe | ||
13 | sNFclKtSiGHAJdCIdjK3gvC2z68NqRB23hxiPqfM0LBYlbZsA4AuYZyHlcoOTApe | ||
14 | 3y+69VRyG2H++MIVheHqqvIckq/p3XqWT5dHtI3YU7cunNGc5OofKjmpO1x+UV2l | ||
15 | 18H3DzW916pCNpqBlCj0wbv0h35ZUcxFCjTwSTPdjsqjninm6tPCXc2CgO2XOrPW | ||
16 | f4AekYifCwetD8bXbtycrYnykXLYJexIlFdUkUANa3H6cZ5gqGPE1ZF4Te1FVGCF | ||
17 | CSJrzSMDE0IidXqc/0dp9dsZQ5D4pi+/XYvAdx/HWV5PwD9UxmlB100CAwEAAQ== | ||
18 | -----END RSA PUBLIC KEY----- | ||
19 | ''; | ||
20 | "sirius" = '' | ||
21 | Subnet = 10.142.0.100 | ||
22 | |||
23 | -----BEGIN RSA PUBLIC KEY----- | ||
24 | MIICCgKCAgEAl+YcFEkCPtBJmKj9rFRr+Tcez3nV53cKhWj9kSuGbZ8idZdC+Qop | ||
25 | eEN00LRQsEJwVg8RHqdK96qbgf21DBNjXXURqkslvDyhOOH1CzXvxlzZHbppAeI8 | ||
26 | lE3by62FaT2Uu7I6IKk+rcLnAOc2P5koYM8tm6C0deJM7uegutBrPNDJq7vgHidH | ||
27 | nhtduC/qX3wPf3D+69to0eIzswbIq5eQ+mrXoQJ2VMNsWZdEKCP23w/i+ikRkU6j | ||
28 | bU10sQt97KuqSNRE9QkTwtdPT2dduv6RdfgxDU1vSfWhv3xd3YPIgdfegF5sHBBc | ||
29 | W2v/R9pb01efcdev1+aW4TRZb9qN9qv3sr6Na2Jyti+Baqki1B8xwxjXX1vfm7k1 | ||
30 | mxkScIfbxCWK5H9WzCoOsU+Vat3PWNUxZbGlPI+Bo8UJ+Ay5wuAwXEZA9XWNnSuj | ||
31 | D/UtxalyNMlHQzPqFgTdkuT1lyYZKoDLTAZxlAgDUcGvyQ+bx6uPj6yBZxqy26TM | ||
32 | ZJb9tK3BklIzc1vojs9XfNQnnMkCIHtMLsmqyzudE+FwJycishnUHKAJ5W8/tt6S | ||
33 | sFOfXN97FHUfAp1652Cax2xYznjpnrakNbsIGVThkpA9xm+GaLS4FQtVmYLMNna0 | ||
34 | mE6NGf83Esgg1s9F9IR95O87WlYXAb99Ahcf3iOIZELBSTEu3JifBYcCAwEAAQ== | ||
35 | -----END RSA PUBLIC KEY----- | ||
36 | ''; | ||
37 | "arbro" = '' | ||
38 | Subnet = 10.142.0.102 | ||
39 | |||
40 | -----BEGIN RSA PUBLIC KEY----- | ||
41 | MIICCgKCAgEArS7bRAiVQMP+bIRrXs+FYLFm8SezgL/KEbbVTEy7N0fij1Yb/CtN | ||
42 | CRUhQDqQjIKPYwrXtd+fZCFIgAtn9RvtZPEaHAL1WUusuN1/zT4edZN1AOjr7ux5 | ||
43 | 2SIuMcdjo5S7tFhqvyBADs1oYeD9usmOzjEHd9AwFJGHVMWJKHjguHXi26vRfTIL | ||
44 | VkpEegzIo09dju98NUJr4iQPGKkHA15KV9iWO6DzOBSeHoxKk3ddqvp38oQmyvS2 | ||
45 | MbjDuCBZNOe8GRmp82WawQOtyT9BGRfwXhYcXdzPgaVjBeR8bY4DmT8kqPnZqeXA | ||
46 | xigKk92rS2EUvB3QpBr8VDKaIwNXjxl+ASXqEWqOXbEO4KeOl41Cx61mKUZ7/Cg7 | ||
47 | 8RO6Ws/2kq8jBplYTKgF8Zb84goR6qHehjl9toCn84f3pYFgyRBAUmTOUhohS+/0 | ||
48 | 8M9M1MYRHKgJgIkzNeAGEo4Zv7AeWBpkN2VDyTkoWEeeezxqhz1w0U6UKxNZdIW/ | ||
49 | oGHrImnCc4GE/JMkkh7FaweeIT4e7/xeDVKvF1xW6bCWksemD1ulZFToqEdpFd53 | ||
50 | jN+UDo1vMwL8R0xJNXHRzlqlRovoDqHz9NcIVtsbs3vm/lIjlCutXo2ulIFO2ENC | ||
51 | emyCjZRlXhhPUrf8UD5Mbg20ksIDO46xJxLJmPqOM4sh39F6VRFgPz0CAwEAAQ== | ||
52 | -----END RSA PUBLIC KEY----- | ||
53 | ''; | ||
54 | "surtr" = '' | ||
55 | Address = surtr.yggdrasil.li | ||
56 | Subnet = 10.142.0.1 | ||
57 | Port = 656 | ||
58 | |||
59 | -----BEGIN RSA PUBLIC KEY----- | ||
60 | MIICCgKCAgEAxZVZU4NxeB5uVzIgOKF5TWp5K/GcV9e4H1q6IHmp+qauST5vQS8i | ||
61 | 3YPuTapKwMZnqHLMQG6+HkCAAVdKBMyKm9alznjfR+M8mtj/zNgce360JjeAXko6 | ||
62 | mSBX02AeVhbj7WyhACt7sTKSIS6alXNCUnz038+qETgjrbNi518RPPBLz2Mf1woW | ||
63 | 73ZkKmEjpG6khG3alzw5Ne3eaKWiy3DHymEH9jeqGmT83hkVjpgtTeCMnT35b1uR | ||
64 | ZJs1w7vn7ur/UV4FzuZHYMmPpS1OvXJqb8uolfrikdB760wJuyfPyus5Y49fC7PM | ||
65 | yxZZgpIdWlMyowLtv8zYO9iwpilQpwwyK8GMywzHQBga5/0EEh7gcy3MRVwRyP6Y | ||
66 | TP84VMntniIRaJ/JhwNxn9JLKMeI6ggiVwcj8KQ68nDf/SwodIFHPU7GCstOfk4i | ||
67 | LsG6/fRCCJc9exeBAU7PZEGDOEjwi6kAscy1pmKx6BwHaBjj74zLjn3VjzFvKH1b | ||
68 | ycydEFznNOUk8y3cFkT/zbDMz3Y7+/P/tEgMDWDynF4wGtFmTOpwbq3nVFMjRsww | ||
69 | yLEppO9LtGIS/vvXr4UEBG0T1NtOP5ht3xPuVyTNCK7hg/W0lybV30LhaSJzhO+l | ||
70 | qkmXVF8CqHuhA1e2UfQRTSVKCrTikbPIQnOazXI3Vt3Kw53qdscRuKMCAwEAAQ== | ||
71 | -----END RSA PUBLIC KEY----- | ||
72 | ''; | ||
73 | "reimar" = '' | ||
74 | Subnet = 10.142.0.101 | ||
75 | |||
76 | -----BEGIN RSA PUBLIC KEY----- | ||
77 | MIICCgKCAgEA361NGc6b0tmjD52jrudgWlWAVrGrRX8ApjuWhFLHpyfTD3g4D6Sl | ||
78 | QHAUU7xzBBrDMZ3YeMqbL5C96ar55InCxj0XccfFk/i0Decsi5kdBSp42nQdB9df | ||
79 | YTn1wGxgmTYljjlbxMCY8/zrn6AvyDJH2LGqk8fDf84+EfIjRLaGn4toI3GGcCB4 | ||
80 | 5tqjPEbfNXMdhFlErRyw7CZpIInMIpyoQG6TAgf09w+OyBPybudR3p8nXQliTkN6 | ||
81 | idqH1g9W3hSaw0vNYJu7XCzUSPo+KguGpBZbNom21AXokIsZuPh2WornnTdUW7OZ | ||
82 | strVjctWuhqoa35Fp5pmkBHNQI6EoJLTfOzlxVdEGHhRo7X9HoCBj2q+ZoiU8/zu | ||
83 | MJPHSkPu7Iqdgx7EoBwSY7x72XStzQPQFpkFXTkS1ZGd/AdVvpYxraFrxnDZJ49Z | ||
84 | FxnGYCx7gc2VoKzVzczDqXWyYK9p3yd5T1n2kpOZ21iwcTQLYuLhLzsi7vNcMQZ6 | ||
85 | 9o0eLBIM5oHCZ77/Kyf0FT7s5UVceRxogsdEwcHEp84jhCpRSyp5Qt/yUPrytOrp | ||
86 | 8OJWrkfDTqF8awOywPNTSlP8S4FvYF8p26Mx/VLIrDYyNlDbHSXHz5FzJcUacUxc | ||
87 | /SubpKAZ9yLC59PC0h1/Tca8jIqVcHbNUEqfxGsI/xhyviZIigwO/QECAwEAAQ== | ||
88 | -----END RSA PUBLIC KEY----- | ||
89 | ''; | ||
90 | |||
91 | } | ||
92 | |||
diff --git a/custom/tinc/yggdrasil-hosts.nix b/custom/tinc/yggdrasil-hosts.nix index 6dbb58e3..cfba8242 100644..120000 --- a/custom/tinc/yggdrasil-hosts.nix +++ b/custom/tinc/yggdrasil-hosts.nix | |||
@@ -1,81 +1 @@ | |||
1 | { | ../../yggdrasil/hosts.nix \ No newline at end of file | |
2 | "vindler" = '' | ||
3 | Subnet = 10.141.3.1 | ||
4 | |||
5 | -----BEGIN RSA PUBLIC KEY----- | ||
6 | MIIBCgKCAQEAoLNp7Q/ZfU2rs01Vk1hNlIpHxWJOLny3pvK0JKqjAchs+ccfYwoZ | ||
7 | eTUhfbydjXMtTmYeqcecKh+yNgGhhN7t44BZW89xjrxs7NqJuzp77+OAEGPz+6q9 | ||
8 | o9bbU36tMwUebbhoBjt4fIkDtgWZh0tevAD2td1Fk4vwRvfJF6pIT+/OmU5noh5F | ||
9 | HWEn/HL9dLqWGn3vRYy3WR+/cmwT+K1RvzVFdKvHDEP2cY5dd1Ln7L1ztr5N9unH | ||
10 | sRCFWeIkIV35QY8D1RacWy3ZmoBlEJxbaXI9ZC5pCBcyqzNCUOycSY+HblD0W0/0 | ||
11 | cih+b3ijr+NZHjSKcZyDnZLaVCWFbG6kkQIDAQAB | ||
12 | -----END RSA PUBLIC KEY----- | ||
13 | ''; | ||
14 | "skadhi" = '' | ||
15 | Subnet = 10.141.2.0/24 | ||
16 | |||
17 | -----BEGIN RSA PUBLIC KEY----- | ||
18 | MIICCgKCAgEAuHfSceBjEZrCUceHVODSTp1M8ffcfIinGRDFNpDVutEJNFnY3DOY | ||
19 | Bm1cD2TiDdIAiyhCT285AYdOxtGBI308DPlrqrzPWxt8V43CmykbB87lj8fNysta | ||
20 | pZo38gSXm39gpmC+9wqtYDmOiiEiUpAcmgX6OPhz01nHD8suUHdu3M1gFNoaZGAg | ||
21 | gbeJorwqiP8IKa2uvMiThNDEU9K6KgALDnijwh5Duns3ZugsIkDfHlwwx9hfaxV8 | ||
22 | qi4aYlNYUiQ98pwazdDqSqC07zHaMPNBjqBJRN/hLvaPS0uK4xpxGyoeAA+6cGpM | ||
23 | 3lvvV9vhZuLQnhTDcMv2cMMgVb1o+VzYmEruOf5g1wrtbhqJKAhxt6SToR5AMQ+D | ||
24 | 1T8bFWnAKnEqa1LRKhAq/ancfM4f6PP9Any8O96zw2Nccbti29S262k/iMIPOmpW | ||
25 | YTHhzWhqCmg9LA0FCJpKhrkr/tKAXuz5hGfgViE8LzEEp9astIKjrqIecuMjP1RG | ||
26 | cpQMx5oqFVxxv74yuVkINEgh6NHjaMuu7v/8ZDOTsbMJNS6CLrAweKCPOBS5aodS | ||
27 | Wwe9OsyvV5vU2EpAtWixr+Kh51aL889fIaw8F2PO3w6wdRCdHz+csJvsVgVoYfLg | ||
28 | VGNVpy2vxpajwQuOVXD8nxMNDh+fSXYqkRz4f1o5BM+y1i0rgJ6XxLECAwEAAQ== | ||
29 | -----END RSA PUBLIC KEY----- | ||
30 | ''; | ||
31 | "skadhlingur" = '' | ||
32 | Subnet = 10.141.2.2 | ||
33 | |||
34 | -----BEGIN RSA PUBLIC KEY----- | ||
35 | MIIBCgKCAQEAndEnbH8VF93ka3geCqMC/5kiZYYmvIkab+EbXd9PKVz7VzGbHo+3 | ||
36 | ROXXo7md5+NQpRzMdtoAfb1ZXDeFm4AlHtKlbf+mtJYFFBAQy3YReuFlL0SNSXOD | ||
37 | SVbtwzhB6M1C+Gn6iyqc5e1B6Y7EgCviklflsn37/OMmjHRoEKXJH3tkPlL+RmsN | ||
38 | G+nPTjGFmg9d9dTDLFA5L9KGrLSVI2ctVF9u5ED0umR33gSr13AQoz25N4oXrrSp | ||
39 | BK6OXxHvazcGa2BP0RHJS7uGYJKZJPINzns5o7O5WpNM5h7dtLhl9frbxKwUewBM | ||
40 | 5m1RRfgmx8o3qHvMWXvbrfe4u0UyPBEaFwIDAQAB | ||
41 | -----END RSA PUBLIC KEY----- | ||
42 | ''; | ||
43 | "surtr" = '' | ||
44 | Subnet = 10.141.0.0/24 | ||
45 | Address = surtr.praseodym.org | ||
46 | |||
47 | -----BEGIN RSA PUBLIC KEY----- | ||
48 | MIICCgKCAgEA5+HnwN6zGfjOBoWiWGZSg9kbM0Cov6e2Xvd/YxMepS5pcvkVBy5k | ||
49 | fjZ1tOcDD00WVSZhhYkJDPGfe1pgAyYlzYOs7avXDKi77cYy0GjAV0q9k4B5ttg4 | ||
50 | cmt0tS4S2Ifu87IEyGKL/PxH+CuNUhBUxlggxdXsKz7gqXubB0p7lJXTB5oa6Kkz | ||
51 | cUGkizv7idqL5nLOPlAwNwoBOLaZb9iiWulX2VE49Y1JbMRW3liuvzGpuJVEH0V1 | ||
52 | n4OZvzIoLxq7Fra+M2sDfOvNCdQccl5FHEF8ViNdOs3/GrP80J2Q1Zk3O0KG2B5X | ||
53 | BXgVe3NjBhKNGOc728wgeC7V3B3DRdyGCC7hHOp6YAQNJotp9vbznV5477SIwZH/ | ||
54 | 569qm0Vx/pMRT6np3ayGZVKyfVLfh6aqXjjNCakwaOI8QdSPy5pbBzVJxqR/bIn7 | ||
55 | vQ70ewLKx7X9Iw7F8QS9I6Frz4JaNyEHGy5oyKtx1SDTmP2yn7uRBq7TCDCdFLuZ | ||
56 | qQXDDUkCnMxa3nzoYQoWPQp1c40cQjlbQfEB6S+W3vKcPvEU21qaQcemrUfPgLud | ||
57 | oVWRwiSRgchAo4z0LsZbd9H5bOx0cLfwvezv2pwLpRow41mfoidaIqaLVr2FS7C4 | ||
58 | 35nLWc6E4MDQA4LADIpyrgP7PtWJQQ7s2q3VWuDdP56sxvmgT66viTECAwEAAQ== | ||
59 | -----END RSA PUBLIC KEY----- | ||
60 | ''; | ||
61 | "borealis" = '' | ||
62 | Subnet = 10.141.1.0/24 | ||
63 | |||
64 | |||
65 | -----BEGIN RSA PUBLIC KEY----- | ||
66 | MIICCgKCAgEAofi0eUYpDjdKChzqNiuey2ERUpUPqCZTcCbSC+BPI7dCBXAR89G8 | ||
67 | Iq+F8svgfco9SVpffCPOtu7Kq9FFzghd4ZDXQATKxzPKucw3CsVYJEdYwzukh3Pt | ||
68 | L0NsRZflZHNjrkqHUvJu0WpmEP28WH0Gqipeq91qPglRRAWhMqM7TcWSYD7vkWGD | ||
69 | 9EJ2IK9yEAWDnCSSfvyZOD1AeDb5q8Z7ZRzzLh2GDrA9gOnuJlX/Uvzu9FIFCmoe | ||
70 | 30L+FhJ71CCXP7q5FflIYIrM8ImdRhu77+20CrWSU18eY6iKXlWjN945T0+iE4qU | ||
71 | X6Ka4uHJT2kh4vKGPQpJeAh8TBABMSSa8SP35KDv6oFJXIGPF8fRWZGYECwD7Eoa | ||
72 | oMjYG2zgYv68u9vHaIO0/Fedp8SXKRiK1N2pN3RqqhUAtOiKwHHUONtSgKp0jbSA | ||
73 | 8gECAX5uxVkNkmsCh0dY0D8pI4KMUXais5Z62a1zDh/WrfGY2K5Y8kEk5rMcvYK3 | ||
74 | Hcula054YLsDmfbh7351pvZ4q51CyRAHH9smIC6X/jfujKvpU8doWp4ePIUgNyJO | ||
75 | zf++1IBN62Cc3hvDmaSfXNxB9XmzcZIzufreDXNSuE7uhD+DXfFpYQ20AsBrws8M | ||
76 | f5cvLnEEQoL7deICvUoaF4ymdnXPDL7hboc//G4qRYlKvVd86OWq0acCAwEAAQ== | ||
77 | -----END RSA PUBLIC KEY----- | ||
78 | ''; | ||
79 | |||
80 | } | ||
81 | |||