diff options
| author | kwadronaut <kwadronaut@leap.se> | 2018-01-29 20:06:52 +0100 |
|---|---|---|
| committer | kwadronaut <kwadronaut@leap.se> | 2018-01-29 20:06:52 +0100 |
| commit | a0a5b5e663f3d150c8e826f2d5600c536f935fa7 (patch) | |
| tree | 6024266cb31373e9dae8223657a3c282e33194b5 | |
| parent | 25a73f12e6ed6444851e805bcb21759dc286340e (diff) | |
| -rw-r--r-- | hiera/idefix.yaml | 9 | ||||
| -rw-r--r-- | hiera/pano.yaml | 9 | ||||
| -rw-r--r-- | hiera/ramix.yaml | 9 | ||||
| -rw-r--r-- | nodes/idefix.json | 3 | ||||
| -rw-r--r-- | nodes/pano.json | 3 | ||||
| -rw-r--r-- | nodes/ramix.json | 3 | ||||
| -rw-r--r-- | tags/berlin.json | 8 | ||||
| -rw-r--r-- | tags/dc.json | 8 |
8 files changed, 43 insertions, 9 deletions
diff --git a/hiera/idefix.yaml b/hiera/idefix.yaml index e654723..c43b2ab 100644 --- a/hiera/idefix.yaml +++ b/hiera/idefix.yaml @@ -50,7 +50,11 @@ hosts: ip_address: "199.119.112.92" port: 22 ip_address: "217.197.90.63" -location: ~ +location: + country_code: DE + hemisphere: "N" + name: Berlin + timezone: "+1" mail: smarthost: [] mixnet: @@ -151,7 +155,8 @@ stunnel: mixnet_server: accept_port: 30934 connect_port: 20934 -tags: [] +tags: + - berlin x509: ca_cert: | -----BEGIN CERTIFICATE----- diff --git a/hiera/pano.yaml b/hiera/pano.yaml index 2032918..261a94b 100644 --- a/hiera/pano.yaml +++ b/hiera/pano.yaml @@ -54,7 +54,11 @@ hosts: ip_address: "199.119.112.92" port: 22 ip_address: "37.218.240.163" -location: ~ +location: + country_code: NL + hemisphere: "N" + name: Amsterdam + timezone: "+1" mail: smarthost: [] mixnet: @@ -155,7 +159,8 @@ stunnel: mixnet_server: accept_port: 38163 connect_port: 28163 -tags: [] +tags: + - amsterdam x509: ca_cert: | -----BEGIN CERTIFICATE----- diff --git a/hiera/ramix.yaml b/hiera/ramix.yaml index 0bbb695..1fb3e56 100644 --- a/hiera/ramix.yaml +++ b/hiera/ramix.yaml @@ -58,7 +58,11 @@ hosts: ip_address: "199.119.112.92" port: 22 ip_address: "199.119.112.92" -location: ~ +location: + country_code: US + hemisphere: "N" + name: "Washington D.C." + timezone: "-5" mail: smarthost: [] mixnet: @@ -159,7 +163,8 @@ stunnel: mixnet_server: accept_port: 37345 connect_port: 27345 -tags: [] +tags: + - dc x509: ca_cert: | -----BEGIN CERTIFICATE----- diff --git a/nodes/idefix.json b/nodes/idefix.json index 4a0f1f0..8cf3043 100644 --- a/nodes/idefix.json +++ b/nodes/idefix.json @@ -3,5 +3,6 @@ "services": "mixnet", "ssh": { "port": 22001 - } + }, + "tags": "berlin" } diff --git a/nodes/pano.json b/nodes/pano.json index 3654ea6..e658564 100644 --- a/nodes/pano.json +++ b/nodes/pano.json @@ -1,4 +1,5 @@ { "ip_address": "37.218.240.163", - "services": "mixnet" + "services": "mixnet", + "tags": "amsterdam" } diff --git a/nodes/ramix.json b/nodes/ramix.json index d63e0c1..8fb5e5a 100644 --- a/nodes/ramix.json +++ b/nodes/ramix.json @@ -1,4 +1,5 @@ { "ip_address": "199.119.112.92", - "services": "mixnet" + "services": "mixnet", + "tags": "dc" } diff --git a/tags/berlin.json b/tags/berlin.json new file mode 100644 index 0000000..cc0ea1c --- /dev/null +++ b/tags/berlin.json @@ -0,0 +1,8 @@ +{ + "location": { + "name": "Berlin", + "country_code": "DE", + "timezone":"+1", + "hemisphere": "N" + } +} diff --git a/tags/dc.json b/tags/dc.json new file mode 100644 index 0000000..92bc548 --- /dev/null +++ b/tags/dc.json @@ -0,0 +1,8 @@ +{ + "location": { + "name": "Washington D.C.", + "country_code": "US", + "timezone":"-5", + "hemisphere": "N" + } +} |