From 25a73f12e6ed6444851e805bcb21759dc286340e Mon Sep 17 00:00:00 2001 From: kwadronaut Date: Mon, 29 Jan 2018 16:23:03 +0100 Subject: add amsterdam location tag --- hiera/assurancetourix.yaml | 11 ++++++++--- hiera/idefix.yaml | 2 +- hiera/pano.yaml | 2 +- hiera/ramix.yaml | 2 +- nodes/assurancetourix.json | 3 ++- tags/amsterdam.json | 8 ++++++++ 6 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 tags/amsterdam.json diff --git a/hiera/assurancetourix.yaml b/hiera/assurancetourix.yaml index 147635c..01154ea 100644 --- a/hiera/assurancetourix.yaml +++ b/hiera/assurancetourix.yaml @@ -46,7 +46,11 @@ hosts: ip_address: "199.119.112.92" port: 22 ip_address: "37.218.242.147" -location: ~ +location: + country_code: NL + hemisphere: "N" + name: Amsterdam + timezone: "+1" mail: smarthost: [] mixnet: @@ -75,7 +79,7 @@ sources: platform: apt: basic: "http://deb.leap.se/platform" - component: snapshots + component: master soledad: package: soledad-server revision: latest @@ -147,7 +151,8 @@ stunnel: mixnet_server: accept_port: 38980 connect_port: 28980 -tags: [] +tags: + - amsterdam x509: ca_cert: | -----BEGIN CERTIFICATE----- diff --git a/hiera/idefix.yaml b/hiera/idefix.yaml index 40acc3c..e654723 100644 --- a/hiera/idefix.yaml +++ b/hiera/idefix.yaml @@ -79,7 +79,7 @@ sources: platform: apt: basic: "http://deb.leap.se/platform" - component: snapshots + component: master soledad: package: soledad-server revision: latest diff --git a/hiera/pano.yaml b/hiera/pano.yaml index 43102da..2032918 100644 --- a/hiera/pano.yaml +++ b/hiera/pano.yaml @@ -83,7 +83,7 @@ sources: platform: apt: basic: "http://deb.leap.se/platform" - component: snapshots + component: master soledad: package: soledad-server revision: latest diff --git a/hiera/ramix.yaml b/hiera/ramix.yaml index dc2dd9e..0bbb695 100644 --- a/hiera/ramix.yaml +++ b/hiera/ramix.yaml @@ -87,7 +87,7 @@ sources: platform: apt: basic: "http://deb.leap.se/platform" - component: snapshots + component: master soledad: package: soledad-server revision: latest diff --git a/nodes/assurancetourix.json b/nodes/assurancetourix.json index f98cbab..9ea00c7 100644 --- a/nodes/assurancetourix.json +++ b/nodes/assurancetourix.json @@ -1,4 +1,5 @@ { "ip_address": "37.218.242.147", - "services": "mixnet" + "services": "mixnet", + "tags": "amsterdam" } diff --git a/tags/amsterdam.json b/tags/amsterdam.json new file mode 100644 index 0000000..3c7b675 --- /dev/null +++ b/tags/amsterdam.json @@ -0,0 +1,8 @@ +{ + "location": { + "name": "Amsterdam", + "country_code": "NL", + "timezone":"+1", + "hemisphere": "N" + } +} -- cgit v1.2.3