summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2017-01-23 14:58:22 +0100
committervarac <varacanero@zeromail.org>2017-01-23 14:58:22 +0100
commit428bf29f0a8a6251220263fdada111c8a3102a65 (patch)
treebbbad955a2d8b493d60dbccffae6d6284ddafd9a
parent8aa2f9b6b544ce3d8ab3459162f841f8957f3762 (diff)
New couch node for cdev: giraffe (replaces zebra)
-rw-r--r--files/nodes/giraffe/giraffe.crt33
-rw-r--r--files/nodes/giraffe/giraffe.key51
-rw-r--r--files/nodes/giraffe/giraffe_ssh.pub1
-rw-r--r--files/ssh/known_hosts2
-rw-r--r--hiera/giraffe.yaml305
-rw-r--r--hiera/lynx.yaml29
-rw-r--r--nodes/giraffe.json (renamed from nodes/zebra.json)5
7 files changed, 406 insertions, 20 deletions
diff --git a/files/nodes/giraffe/giraffe.crt b/files/nodes/giraffe/giraffe.crt
new file mode 100644
index 0000000..4d88da3
--- /dev/null
+++ b/files/nodes/giraffe/giraffe.crt
@@ -0,0 +1,33 @@
+-----BEGIN CERTIFICATE-----
+MIIFtjCCA56gAwIBAgIRAIpAZfuHpQlnjm+XKwH10AMwDQYJKoZIhvcNAQELBQAw
+SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww
+GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTE3MDEyMzAwMDAwMFoXDTE4
+MDEyMzAwMDAwMFowIzEhMB8GA1UEAwwYZ2lyYWZmZS5jZGV2LmJpdG1hc2submV0
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsICTm83YeohP++kN0RE/
+4cN7FEg8iRrpCb5OZQAHi3n5EV+0/CpGpDxrNOCfNTV5RW+o90REJgPrAw2IGUr/
+aSntCL9Ty0rDuU7RuBqFi/q7MHsAhRLJxwcLdnY6wroOQfZSzvJ6oec+zExy7c2d
+s5MiS77Zd3oRY5AnTsYvNDlChYVkBjhWxnvgkJ2KczwyqXNC/aAVeifHsIQGiKcI
+e81j6kcNSQtTNk8DjcBB4VZa6uhUBUGJD21nHxzfu1WkBHLE2cdnhrHOwgsvMw2V
+BFF9P+cwZVrRHsAeNbnzTisSiqnQemI7hfYTu7MZE+7xUZgmgj3U/+22A+K/u215
+QdzAAnlv5Us3MHxNGomfSiH5pEwNVJ3LQXXkCL8grN2YDTW3fNvZed8hb1/7Lhem
+jcaRHIqROwXBNPLqTxn7TcTEuuMTjoUHgAR5gJB4cobYTcSzo4K65T94HIhEoSOd
+A6amkFZqcMHlgiVp+/4XWSWziEPubiBiGe2nHgY28uMEGXjLJp86lG65Gc46t+gW
+753CcqJk0wKjyRfuyy+s6worCDRnO2hTvTvUFrzoE13DfjQknE8Jfy8PHzrB//uH
+FXNh4stK2piF6IrtVIBDdueCESvKHkWX5HLf7NsBPLBDpcMD7/sTXDtdl5XJ1+dt
+Q8LDVbc9KPu4FRU8sYtFY4ECAwEAAaOBvTCBujAdBgNVHQ4EFgQUuZKJHxhojPeE
+WRTGs4FGggdiZ6EwQQYDVR0RBDowOIIWZ2lyYWZmZS5jZGV2LmJpdG1hc2suaYIY
+Z2lyYWZmZS5jZGV2LmJpdG1hc2submV0hwQl2vK/MAsGA1UdDwQEAwIFoDAdBgNV
+HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwCQYDVR0TBAIwADAfBgNVHSMEGDAW
+gBS5gYMsvayzCdikce8+ui3UlT4PjzANBgkqhkiG9w0BAQsFAAOCAgEAC3Akkds6
+aIGEbN5E2NFB4gbWVd7LjydSNVhbqGy1svM5RAT+MRuIHZQ6XwDF+eTq+1P+olgG
+WjLQhElhxXqk1tzS51CknDFdUNE8A24A/EKGQk5qKkiTqwou92/EmsQS0uaTLjxd
+M7uCKXbjhtFNL1X/YaBDdC1y6vBKwIOKq4uf2dKrHbJFoju10tqltHxhjIUmv6Ll
+rQtoUFpOMcuxslXXRJmLqZEo2tEbzma/ojfn2/TC7eeCBBlN8/jNo14FY4tO+LG/
+eB101g2DkrPi0+vXpLheVwC24rkPEZhGGbAQDwFWl66NyQMrqHuM9VCsYQJLfmi9
+quY0AP9cOsj3HBsxp4AH/Hwdw1ggoGGrXaL+b8PKWBBUZ6V3Py943oiy7DQ/4pmK
+E10pewJ0nbFFRKjzBIeHXFrC7nnAkJ+wuPhVTRjWdavmtV/c71BUsj9RypV1mwDS
+YfaqCKb7F3WE6JBbDdRlpYbgF7u0n+mM0+y2KXylhCDN/U2pX2+OGfF44GNx2I9X
+Z6J3JiyuiuZLOY4kifmAldBLc+oXJQBbdZI2Vk58XJGN99a7N4OAwrLA8brYVCKg
+1tRjXKTdLGSviSmKPd1t1y8oB7gYnXiR9hASkoJgv+2cYvr4dSkgweXSWZKVOeW8
+s02ix2KlFpLdIhrBNHsMbXPZ7mCgHQg27+Y=
+-----END CERTIFICATE-----
diff --git a/files/nodes/giraffe/giraffe.key b/files/nodes/giraffe/giraffe.key
new file mode 100644
index 0000000..6095c04
--- /dev/null
+++ b/files/nodes/giraffe/giraffe.key
@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----
diff --git a/files/nodes/giraffe/giraffe_ssh.pub b/files/nodes/giraffe/giraffe_ssh.pub
new file mode 100644
index 0000000..338a804
--- /dev/null
+++ b/files/nodes/giraffe/giraffe_ssh.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCucBWeL3Konoolf/3RHuhMCSd+GL+1wM9pyH8TiHATKN7wGbjcN+TbSthLca4qW8h5AwQWtwX2Fz0rzp5m3jrHMDH9C2kZdtV0SSv3EkG8qA19QL3UlOHI/cR959CvGEqDVn8qrnfEhp866NHNZ0Oy+eqfdYbrAGxsTOFJYhlxeAcgtPwDnunEfVyycmjgijx8VlNzb0iLFEUAlK4+wKubabrm1ZgiVIvJrivZ2oUrOvplOlo9WPwdYDZCahjsWxTHIMFtPxaJMQsE0jzu/BnwvMztVyyfpYypB/IVFMY/onADExB2BDbTu0mFpHskd+pQSLQnm7Yrf6/Jg8e1FoGv \ No newline at end of file
diff --git a/files/ssh/known_hosts b/files/ssh/known_hosts
index 4a74237..9846c1a 100644
--- a/files/ssh/known_hosts
+++ b/files/ssh/known_hosts
@@ -12,6 +12,7 @@ diplocaulus,diplocaulus.bitmask.i,diplocaulus.bitmask.net,199.119.112.150 ssh-rs
donkey,donkey.unstable.bitmask.i,donkey.unstable.bitmask.net,199.119.112.207 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzQJXmGyldmFNuUoUoZuf1N78/p5Wb0UYKlnKbx+ydwux1xMheVyoroheAd19Pc42nxKsdEi3qhlPTRoo+8IGluNgU+ptUE6x3490/AcaKsPZEkAsXpzMFYFki+YDPEfA3+Rlq8BmNZi4/EHtZwtPt907tKmojn3bc13i+4z/lQkHL/foe+NTveQ46UUa23ZEwRibZ7QZfmdk+hu3S2Dmz+JsHb5hxbUziSYUkbcm2lrhy7IEJyncwE2U4sVdlZmgnoNvgsbuvlhhDFGrFGXedD2BfxeYhjJj8Nga1y7BYdfFlodxczpEHiiLO8h1sbVhVUOxIdLu/e+ZfGuJfvFsR
dotterel,dotterel.dev.bitmask.i,dotterel.dev.bitmask.net,37.218.240.50 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtwy1DFLdBQOTDwGLtlewA8hHcgz/q4nuW70BZnH3nlYFm4UqIm7KUMSCflDceNBcntedka2obzoeSEfa7j8ODzrBsrIebrPN50B3uM1svcfIivrVnNXHsAPiz2c7LBO5/+XuTfmLm0lrOeiBQxaDxo0GGqEFxo8/SFWgCtHNNSVLynroQl7uN50P3+h0G60XTJh/EYD8I6oM0cvL+a/vbBdJz3nTN/uDvDO9lATu9u1jk/L8Bo2388IOYwDibW1yg9nE3xjWX59bndod5hKrGczJ4v/hIyKxO8Bv+44whxws1qGy2s4JMbQWmt3HVy4U1wU1/ykc6ZDIjo9IJjJOR
elephant,elephant.dev.bitmask.i,elephant.dev.bitmask.net,37.218.242.214 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwEsXoJcsOryYgjdtF6ZwJ6iecjvG/TVyOTcfdYJCPzZXA3Pj6CPmq0R1HrfnQLq3orgQG+uxAFdkJw3jFTJVYI47MWigfFum10Mu8/URGANd50Ahn0NxRBAqgjSBog5r9xEDPc1OLur91VHCV95sKK+Qfh18h9MGdyB2ypN4puON1JXLkxdUmlOt80vs5tX6mLTik9JzV6QQrJN0I2GZfVWg46y0jPQehl3OS+3z8Z4RBKXUaxQPoHx/G+VukUL76hQUMlqEzH2pF9nrkkM1uHDOftBBeiWZo3X/89ljsrDrP9wurQ+/bzEUiEbg3ZW1ZIe/T3FFrAUi2r3giyEEf
+giraffe,giraffe.cdev.bitmask.i,giraffe.cdev.bitmask.net,37.218.242.191 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCucBWeL3Konoolf/3RHuhMCSd+GL+1wM9pyH8TiHATKN7wGbjcN+TbSthLca4qW8h5AwQWtwX2Fz0rzp5m3jrHMDH9C2kZdtV0SSv3EkG8qA19QL3UlOHI/cR959CvGEqDVn8qrnfEhp866NHNZ0Oy+eqfdYbrAGxsTOFJYhlxeAcgtPwDnunEfVyycmjgijx8VlNzb0iLFEUAlK4+wKubabrm1ZgiVIvJrivZ2oUrOvplOlo9WPwdYDZCahjsWxTHIMFtPxaJMQsE0jzu/BnwvMztVyyfpYypB/IVFMY/onADExB2BDbTu0mFpHskd+pQSLQnm7Yrf6/Jg8e1FoGv
leech,leech.demo.bitmask.i,leech.demo.bitmask.net,198.252.153.85 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxGPMkrINVARV9unydaLMxf16JFa5HWv2OqUXlwRXrhlYP8pBBAEjZaXAi3LMee3byg+NHhofSgRWd76zMW5+vX8HqXVMtCpXRzMk+1EpjA7u8xYW1dWEDMLWCjbB4aB1D1NLTD9u6mn0xJCRIUrqFMrMPyh5xD2M1WPB0lEM7rH79Hm5N4QvKPd0bEFQAYSDlV/hdArp5B1OhQxI8ROu+f6JCA4HEe3+qO8BrtGb4V1dyAdYiViL1IMIYvjQoC0lZm86KAsVDkW8kApYc3js5taSVFYcL58SVcMekjA34klC9pdCxeJNjg9whQP0cAg4/U4C9V8mW/EhzHgXU5FpZ
lynx,lynx.cdev.bitmask.i,lynx.cdev.bitmask.net,37.218.242.146 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwEsXoJcsOryYgjdtF6ZwJ6iecjvG/TVyOTcfdYJCPzZXA3Pj6CPmq0R1HrfnQLq3orgQG+uxAFdkJw3jFTJVYI47MWigfFum10Mu8/URGANd50Ahn0NxRBAqgjSBog5r9xEDPc1OLur91VHCV95sKK+Qfh18h9MGdyB2ypN4puON1JXLkxdUmlOt80vs5tX6mLTik9JzV6QQrJN0I2GZfVWg46y0jPQehl3OS+3z8Z4RBKXUaxQPoHx/G+VukUL76hQUMlqEzH2pF9nrkkM1uHDOftBBeiWZo3X/89ljsrDrP9wurQ+/bzEUiEbg3ZW1ZIe/T3FFrAUi2r3giyEEf
millipede,millipede.demo.bitmask.i,millipede.demo.bitmask.net,198.252.153.83 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBG02MrdDFaqZO11JbYSAAC5q/W/FCch3AQXo+dRcpErvHLmv9kWkrV1ESqfZ+s6qEfk8Aqv0vsym7YigMiGXlBo=
@@ -19,4 +20,3 @@ newt,newt.dev.bitmask.i,newt.dev.bitmask.net,37.218.242.145 ssh-rsa AAAAB3NzaC1y
otter,otter.demo.bitmask.i,otter.demo.bitmask.net,46.165.242.166 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCab6r51XEW9LjZVDZs3q/aIpn+oKo468ovivZIQPMmYMs6NUJ2z7Oc9YROAM3lfxcHHShNBIpxg/pSKnQ743hHavV3y+mEPbo4W3hbByuR6GJRaKxHP42NMfNxJUHpaix8jCrMkNypFGMss9C403quy62yGfN7hWIH/pWFR9z+GvWaLpl0J1T+sadeqYGrjiWPwmo88ZAo/RRsXEORyPMz/X7+pa+DvYrg9FqOnNNK0EvHI5asxRQMojpbt6DRpOkkDPkFZp/gpGRQCAbnaKtalkfC/HhbHepGiqQwMRphcpTmnJvOfIGy+YnUoV3RwoRzb5HAT6FkJ9c4gsTs+6Rp
snail,snail.dev.bitmask.i,snail.dev.bitmask.net,37.218.242.215 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwEsXoJcsOryYgjdtF6ZwJ6iecjvG/TVyOTcfdYJCPzZXA3Pj6CPmq0R1HrfnQLq3orgQG+uxAFdkJw3jFTJVYI47MWigfFum10Mu8/URGANd50Ahn0NxRBAqgjSBog5r9xEDPc1OLur91VHCV95sKK+Qfh18h9MGdyB2ypN4puON1JXLkxdUmlOt80vs5tX6mLTik9JzV6QQrJN0I2GZfVWg46y0jPQehl3OS+3z8Z4RBKXUaxQPoHx/G+VukUL76hQUMlqEzH2pF9nrkkM1uHDOftBBeiWZo3X/89ljsrDrP9wurQ+/bzEUiEbg3ZW1ZIe/T3FFrAUi2r3giyEEf
tuatara,tuatara.unstable.bitmask.i,tuatara.unstable.bitmask.net,199.119.112.208 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxCGm32xKS3Xds8QrUHwpaG2jb7hiFFoIc4UMVzreT7Vjq2KdospNUYvw0bfNKLb9YW6XpQAHrFRk+mn8+4VY3LIePDNsH21DRZl2MQSw7Kmuzrqy99rKQCeDAiiP0aTQXiFDpa34+Eh1Z4t4II1VKCDMKRv7+YKORIs1q+xzZv+ythaxikCT3AMbKbcTlpI/td0eIccBVfBm89kJI9RHZGZO2CVEj8Rcd0f+JtIM2cP08V+mlHCHgfgy8FXrI/G5egyFwC7/EiBOTseVBOiq8n9yfJUmYOCVzu6Er+We90Kj+OgYcj9Ap50MBi2ivZalrFeySooRmuU/OmC5vww0n
-zebra,zebra.cdev.bitmask.i,zebra.cdev.bitmask.net,37.218.242.147 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwEsXoJcsOryYgjdtF6ZwJ6iecjvG/TVyOTcfdYJCPzZXA3Pj6CPmq0R1HrfnQLq3orgQG+uxAFdkJw3jFTJVYI47MWigfFum10Mu8/URGANd50Ahn0NxRBAqgjSBog5r9xEDPc1OLur91VHCV95sKK+Qfh18h9MGdyB2ypN4puON1JXLkxdUmlOt80vs5tX6mLTik9JzV6QQrJN0I2GZfVWg46y0jPQehl3OS+3z8Z4RBKXUaxQPoHx/G+VukUL76hQUMlqEzH2pF9nrkkM1uHDOftBBeiWZo3X/89ljsrDrP9wurQ+/bzEUiEbg3ZW1ZIe/T3FFrAUi2r3giyEEf
diff --git a/hiera/giraffe.yaml b/hiera/giraffe.yaml
new file mode 100644
index 0000000..5c1a750
--- /dev/null
+++ b/hiera/giraffe.yaml
@@ -0,0 +1,305 @@
+---
+contacts:
+ - drebs@leap.se
+ - sysdev@leap.se
+couch:
+ mode: plain
+ port: 5984
+ users:
+ admin:
+ password: abVQmkZubeAvncgcVSYRD4_pHANEItWb
+ salt: a5a58ff4365be3113f19014ea3050129
+ username: admin
+ leap_mx:
+ password: HJXaTzM5gChwwr5Ur3epyacegvXNIDYK
+ salt: b80d3038cfaa3bd0802dc140752d0dc6
+ username: leap_mx
+ nickserver:
+ password: vjJAZqxPL4BeGKAEUVuBVK5MIba_aIY5
+ salt: eab38a050b5eb2569549f8e50cab9034
+ username: nickserver
+ replication:
+ password: CGcAbvXcXuGRUJE_WSj6TEw6cJxNHRtu
+ salt: d124d33d15f0171cead41d238e58ec9e
+ username: replication
+ soledad:
+ password: MrUyYGnT_44NUyBAm46L3GCLPHKVZ_De
+ salt: ac15331e0c098126e04ecf7a21045079
+ username: soledad
+ webapp:
+ password: _CatyL3Ienc4wRrfPubrhyfYCFmCyt9t
+ salt: 1c1dd6eb78f027414f1638bd6c902a5a
+ username: webapp
+ webapp:
+ nagios_test_pw: HpR8dKsLPnYXjQaHXfC3rP_dM3CpXKIL
+development:
+ site_config: true
+dns:
+ public: true
+domain:
+ full: giraffe.cdev.bitmask.net
+ full_suffix: cdev.bitmask.net
+ internal: giraffe.cdev.bitmask.i
+ internal_suffix: cdev.bitmask.i
+ name: giraffe.cdev.bitmask.net
+enabled: true
+environment: clientdev
+firewall:
+ soledad:
+ from: "*"
+ port: 2323
+ to: "37.218.242.191"
+ ssh:
+ from: sysadmin
+ port: 22
+ to: "37.218.242.191"
+ stunnel: []
+hosts:
+ lynx:
+ aliases:
+ - api.cdev.bitmask.net
+ - cdev.bitmask.net
+ - nicknym.cdev.bitmask.net
+ domain_full: lynx.cdev.bitmask.net
+ domain_internal: lynx.cdev.bitmask.i
+ host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwEsXoJcsOryYgjdtF6ZwJ6iecjvG/TVyOTcfdYJCPzZXA3Pj6CPmq0R1HrfnQLq3orgQG+uxAFdkJw3jFTJVYI47MWigfFum10Mu8/URGANd50Ahn0NxRBAqgjSBog5r9xEDPc1OLur91VHCV95sKK+Qfh18h9MGdyB2ypN4puON1JXLkxdUmlOt80vs5tX6mLTik9JzV6QQrJN0I2GZfVWg46y0jPQehl3OS+3z8Z4RBKXUaxQPoHx/G+VukUL76hQUMlqEzH2pF9nrkkM1uHDOftBBeiWZo3X/89ljsrDrP9wurQ+/bzEUiEbg3ZW1ZIe/T3FFrAUi2r3giyEEf"
+ ip_address: "37.218.242.146"
+ port: 22
+ip_address: "37.218.242.191"
+location:
+ country_code: NL
+ hemisphere: "N"
+ name: Amsterdam
+ timezone: "+1"
+mail:
+ smarthost:
+ - lynx.cdev.bitmask.net
+name: giraffe
+platform:
+ major_version: "0.10"
+ version: "0.10"
+service_type: public_service
+services:
+ - couchdb
+ - soledad
+soledad:
+ couchdb_leap_mx_user:
+ username: leap_mx
+ couchdb_soledad_user:
+ password: MrUyYGnT_44NUyBAm46L3GCLPHKVZ_De
+ salt: ac15331e0c098126e04ecf7a21045079
+ username: soledad
+ port: 2323
+sources:
+ apt:
+ backports: "http://deb.debian.org/debian/"
+ basic: "http://deb.debian.org/debian/"
+ security: "http://security.debian.org/"
+ leap-mx:
+ package: leap-mx
+ revision: latest
+ type: apt
+ nickserver:
+ revision: origin/master
+ source: "https://leap.se/git/nickserver"
+ type: git
+ platform:
+ apt:
+ basic: "http://deb.leap.se/experimental-0.9"
+ soledad:
+ package: soledad-server
+ revision: latest
+ type: apt
+ webapp:
+ revision: origin/master
+ source: "https://leap.se/git/leap_web"
+ type: git
+ssh:
+ authorized_keys:
+ azul:
+ key: AAAAB3NzaC1yc2EAAAABIwAAAQEA2rpPukC7v43Q9RvYgxAx1aDsem7+eZvvSKR+Uvkb0yRvI4h56eds1Cj0pOFOCinjIMyw+LkrhcubWDtFYzC1yTHUUcjSoIi2M+TurQZdTkMnsg2u34U61+EjOPb2jYdxBwUu9e/wDRGqih7FjFYCsHFMPH1ENVS+LZeerXn1F344HIP8VhLpWSjLAKgfMUCuvoTEqNaR4I90w1PAG0uRslYouTuxOA3VOCnf75FW7b4ZuBw1y2rmWcz9Rm5M4tz3EQCeX8v+AIKd6QQU0gFSytcelQtBVqu0YjnnL5Lp+fcKw3BJO+QQXk+OyYqGuP9WQfPPki2tEDHJ9rHcPD3l+w==
+ type: ssh-rsa
+ chiiph:
+ key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDAotYxNrKKXihZrDd39iKrXZSm3r8L9SNzhe9JG6cPaLTYuxhrS9QejYih9noboWfsVFmNPFYH42u3/vMyJEtf1WEUqQ84Qh2oQaC3orGMdpo3fXlCwlcp9q55gZTbSkpKwjn4pmg++wdTNjMmldi1ifPDl2uVt7dUkjQk8hy7CTJofkTxrXIzGZx+OI0knuos+lNV1uU3nJ6upbBwkvxwy3S9nfZ9kq7y5PBo0wK9YkOrKIAZtCnb0nobOiFMPeQDJdBWIo0btv5tCtzqe/b28TYz6DrMWrLIEJ+t8PH6QxaB0oLtlx5fImRxykLVHEe9AO1WcV0aXW4+6ZsHRG4X
+ type: ssh-rsa
+ db:
+ key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCZoVRqaxZL4Btmt7Nfcj0jNbM5UhBSFl37MWApS9qUlx1zJeH7Vw1ZRzUT8zLtdpOyL4JrF1jJ+D25/dqdTEv5dc7I/IcUz16uVD3REi9wk9uRo05DmG1PXQ0Pp3kRGhNFTh5e1ZeGbPlxZkHyUirWGz8A6hrPTUA/k+KRsQg4nH+3UTPzZcy3jvw6YvdATFNkZ5dhKyae9T41McBEdh5yPArfuVTL/ssckTxyISF5ObsvbzuuarTeNQQO5VpFvK9luKzXpta9IRHMeAHpu88MCiMcWiZUZlaVlD9tC6OcMNxCBWWMlNwtowgBmoIZnjo7NrMsJ1ksUT4eDsvf6huu9nX3KIigSUeuWPtaPMHCghhLXLQSuIOhQWXjFzl+KzgiOZ4ahmNMqiCaRFHAHw6BRuZRxphiMq2gjvKRg6a4giDIf9gkEQ6v+tiUQoGYXuwfb0sGVJfrnZVifUz+I1j0wWCBWaY7+/LtfaNIl1byyPzG+qRhHMUlj/IALnT4DuHM+VkXNyQ0fucGcyhFxabqfdxRUT0EQok8ib06f16JBCoqdd6bn64v1M29QGFeSF0t4zjqqDik7VQvOMph2WAZv9FwhvPrmbSSs3MIe7wVBaFC8zeavrZ8oCO1U40q2UcntO6Z0NpIhnGZC7zVxguEux1moAtWIE0+JIsrbu41gQ==
+ type: ssh-rsa
+ elijah:
+ key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDB6URGBMMAa5b15Kxb119vEoE+F+mxyEHzwZX1Bfqbc/UtYEhASOkYhjYSUAG1G7EY5ovHLqNC96NZqLALMB87/R9Wsgpo6Kg2qvs6zSSn1kWC+P3C/l1OHaQ3hVSYpeGUg1HoUi8zfMKreyYLvazIKMczvK7Vnx7mJKupLaZ5YJ78VyVhAM92ol8ztx1Mlsckgqvn/Zym+3bkUTkuxInoD3Ujht6hSI8KTa2yLpilgcGwMT+oJ2pWr5E3yhEz/ZBWLyjSw+aUUPEE8ZUJw3zn5PSUtD8mf0cNqzqomvk1HdGbHhRsCZa6yd3/xGsNrw5NUGFj5f/UmpSi9HoActRxMeW3ok/QBJg8p3Txdkpy00m7dLTzOnDfFIzXf7Bn9pD/e1wct/HaOmfH4IJ5Gj6UaWAnLPybWUAKT9q1xVMokMZDNWOvkT/79kKaHdsPh40nhuksCJ5oRw8CZLGs/MOtLyPF2aJG77Gih6LtjhRVq5PHiSwG6bd2Bguwg2jnjUKJ5vLjwwvV5X3xOya4AUcmyPlnvc/gRQty1J1tIyxTcvfJVNX/fZqEDsDZjnzQNaLfe5a6K0E3f+i4pwjfQraMLLT3KzyZtcgqDjN2+DY+HZwOib920Ihr+7xmQ1aRttzwMnVCTqHFN1NMBWEVANMX82gdbubM5Dub8q0eIfF78Q==
+ type: ssh-rsa
+ elijah2:
+ key: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ==
+ type: ssh-rsa
+ ivan:
+ key: AAAAB3NzaC1yc2EAAAADAQABAAACAQD5Z5UfdPaAO0DywH/Hfl1Zm29YJ2SDGfofIRtLdbw06Ov3kG0mnURVC/G1L8IrphLMoRMFJR0f6AXr+XyFOW2xLTvBDfYeuZa26yyjzKAUVp+J+rdmmnJkJQzuF5/WimVsZ+d06omXyD/d9TP2qB2gd9+z/zYOIm7G5H8/9gnC045Hny3Kyd7xOzt24qbCq6pufskRYHp5V/ncgWp/osXE7vGGIxOLDLaaKikAHY4h6Uezh2KphA5a52RKy9jEzKKNW10ltmfg3s2WVjtYsGaEHTsZXs1YDE03uk7cqDsDy98udY9GLiUpz15LBemWVK4lCPG6BWzph0s8zMsEixSw2qAm6butsZE/E6EYNLeTL3eC3tWR/yxQxhdAkRIUAxR2yX/l+vTyMO8Z5ThZx2WWVAXo3zGtxKJUE0LhwD713zBNoT3GTbQKjCyWalAoCQ9QlZCdDhMVw9mVL5hUUY17IiSgvR0HTh66ySJYuM4NN67K+eZhz/aRAbCyG8Uj/M9TQ3td7ExzegUtYYPevWYy0cZf52zqvfz9GXEWJbF5MhJl2/0CZxsmdYPI43/BR9H62tKiC3cjOXYzFQYnRDri+2VHSCcR8gV6veKv/YwezEhc7LY/qc24yGQuXDWiSDjwsvYKrvPo3Uc6T2cTOyMzbW5tro2rD4LE1KYHU51Q6w==
+ type: ssh-rsa
+ jessie:
+ key: AAAAB3NzaC1yc2EAAAABIwAAAQEAu248g60EsU1m5qmmli8nQ0/CYvU7LI5sv7qOjT1vWd94UGiRjIX4hTcbKg+AXT3zB6ieaAozJ31qeoLFxQwznnMNaka5zWcQbFt6ht5q8hsxRQjKOVSfEqH/Bn7eVvlLrp6oEbaBgGixKVGF6RXTLCkmWKo3fjgRM2QY6SylSxRrr8jhGvtcGtAh/tJ4ejWL+WFOV4m77qRS81c/uhNIfgjavCpvOxWoS3mLUe8q3uRnuWqhtXX/8LSOIAbcwXk8X0uhOBRpV81Hy7k0h77JO+otc2OlhYKA2Mu8TGmw2I69YswQyKzNPSU+K2flPClO63lYuJD83jaIPGDC6YNelw==
+ type: ssh-rsa
+ kali:
+ key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDOrTTNY60n/eMKFG4twVfInoO54HEqK2wlETb+Pe91W4sOSPaBtsP4xvk1hj/7WVg1fUN7B2MhYHZRmppyS2eMQGlaBbziFzlm3+rqn997l4CZxxkFsCINFvik60vQjdWn1Qh5gtaTWPLp8igjF43+3FdZZk8arS2AQgHixQdZ0XfjpBvvxpP3DI/VEOgOaCEI8XkDj8WTAkeQxrFmX3/TxbvGARdfYvJwYEC2qE3WABbI+DVOJfLsFmv8RW62ax8ErA63Yy3RWsgnv2Nzxwi6o6MmWcr14f1gpPybPK8KrZNJoJkDVceDTVwdTxwUfjOrI8df8NiFLVR3/lEGX+Cnd0UeKzk5Tqy84g1+MDGWkRDVyplB24fFxi/ujInlasew3uTYS2waZkNrroU2B8VO36xj8C8bn2sf3818hvjS4XD+lvpwKrKaWwWFTM89Xvu/K9KHFn3+58EbcyE88MAzuqrgDarkeXCdVT9Re0OUchmul3JOz9OnV1Osv0yi9pRCaAGTKAivnbN8DwmALz8d9FBTMxbcBgEqqGvyNe7muYTQtvTvfcKHdtF/MlTibte8YIbj7UX+c19A1VxX1eFU7mbfSxW1zXok1D0o+cUfcyUFauq6YMNDK1+FrMID+Mrm86woKB5gOmQRLJ9BARcKl9GZY2YnQAat9hRHQR8O2Q==
+ type: ssh-rsa
+ kwadronaut:
+ key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDnqWoPwiIAylx7wncIz3dl1Pi14/vr9El2tCb3E/nVfbX5VoGyHP8jnGkbaxwWZoTbSXl+ZlUz1Tw0qwDOQleVHXaUVmKZc8ni5crW6G1wGGEfE4ncSn35JWjFcZJTKq7a8DmQuDZDpUdbmz/XFtO3bu8DjpyNW2+7Fn+wHZPWXoDnjQBNryCS0M13thlH8PoGvm9rfRKn9upaTYV7hmF2FmQfMIq68x40DBeKCXA2VomFqeBIjZ/kDQJBZDbTrlp8lIX5h+qqHjJ6cPJvKeMSAaR3mXB4yekFOFcKZJqfFaRiJ1qxpHCdAwxxsklI+8e+CBCh2pJB3TBrJliccwwv
+ type: ssh-rsa
+ meskio:
+ key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDU6cVvh+1LYRYNff17s06E2ZBN5M5VEMYP15JNvM05ARNF7UuLuq0o9CrVRxFIknGBHOB2mtf0Tnc2opbJiq3fOJ/YKv2DBLcm+mrJvJC8gqi1JP76bUEETfuwkB2RHbzvJtDRo991IQcLaKpPjXQ4DBSdKgo4cldQVcpRFGmy3S7IsUjUmvfY/StyHc8bux2yjBDyzUdEA7MiXl7Vu6HA6xD5B+QYO71QVyfl2cYaJ10cxrVE1lJaqLjku8UoaKP1FU4PiLY2or2J1sQEvuhkxoIvYUPpIqEmH43ZeFLxTBMUv2leJs8BmKygzcW35jzZcsK5t23hp40gU7DOX8A1
+ type: ssh-rsa
+ micah:
+ key: AAAAB3NzaC1yc2EAAAADAQABAAACAQC5xvAs8c8KmJ/Lt2TiYthxOVEgUkprbLWVOwK1Hmc+3h6rV4iyT//8dv8Ov79ZMOAuqQhQ5fz7RckOTqoexW/kzbFhXw5NEt+eqHonayiAh8LVt2K79GbMtWmS2ss81ivDyQkaW3+PK5IDibsoOfNeuAZ17Hgudatjc4v7WEjVliYBwPLAA5DUZt8wf7nNQX3moHGE8A+d3S0UDQyEmT657D1p8jmrpg9qTL7nuvjZTq7v/mVErnIDUY83FGdrT1F+gPlCLetzSDeaNkYFm+RjVixF2pZKT+BsHkj/8nTJw7NBh/BTG34pSyuCmepwBBwPEISkfMAEA9Ag+TXq+Oe53GmmBa92asusM7XzyPTxUcvnUAp4kxn5i+65dDx4F2//cVe7+CNCdl8N5p88Xe3jmsTeEdEXnmXPFOBbvAE0kikDE30FqU06u/pLDy7ZG3JTZZtvvFuKrYokgQysDMLaxlMVMANs9WugJkOlexzOeDDgptPf8f2fQs2Q9Xo0xq1wrtD4kdopgtF1LLEFcUDKp7+nev+czzNWbv6ccZotlicZIqauYnBjjGPYz0sC4OCvZjz7bK7nDsdHoaZBSl1YUhTyLUDH2XH8V1lbEOJhfJSp+vZMJETIe8oP+uByEt01FIt8JsRhijXoKCPfXp59P9d3KS8vuaUsCEVrpkkalQ==
+ type: ssh-rsa
+ monitor:
+ key: AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAFqCXlaYmqZqbefpMBaMPqzjhYNaxejlOX/x8YCXsDN2HMfeb/E/FYfpEPCuLVJ5Z0aDkp76JL9i1CX/9Rcbq4DEQEc6vkEv79MOI2jfUCVVeWRcybvRK0YAT9eQK59+FgNDbEo2NCUWBRvKd+8TjzZ7GtCLDnGd6+gkr6orkiA3uus/A==
+ type: ecdsa-sha2-nistp521
+ shyba:
+ key: AAAAB3NzaC1yc2EAAAADAQABAAACAQDmP6LECgLNn/BrTYLMttioGNAMdmvX4DaPZNSWCYIIfn9l+YxnsPu9InHIZFyYsTmuQbN+oErZYMUYruZCBtXBiteG4GWqGVBjTWwfMUlI4KwmjcLiptqTQqfohcuvitNWYSyagxBXPMLDIUMza0VU+EfRTN63RWbPECmOhZNHS3dgw3l5tnxrhW15JYg1erdi+3HBTVv9DfDdJ3wo1AoejBcOYUCepjjaGAfDaFFD5+r7UYmRQCR5kD4m/tnpyAAfpJDte2URXUNmSIDKa6lI4TBV9Z9FTmgjyRT7eMwpHxu6/hphGOsChcu5Wmcy9InGe0j2VTRPkdcvXLawmFY8Ax31ZOEfEg7WxtlbVAxGiOGBs7QIYAeNik+7OJOGsa3cQPA5RuSKexAKDs9Sta+/niHzihdTl52i7z3Hm//gxuA9JVH9Sm1di3F4B9hAQ1zyNh3SNbjOONcxsUlSwY0iBLA2dIRNDs3itY24VsHluCvb8kXzYrN1yOcjtglFGScFM72tJzfamt8powGbvGBZAfexhZGxe+brC94f1WqR2WhHclimsGTRSD/PnDEBnqp6NcaQ6Ykpl3MUZh5HfXp/kdYpQvxpltbRGwyYi/5gYrzu1fgjLQKYPR9BK0okiARR0Ko2g4GLr2dvCV/ZpHvFNJvP3wSkiKbIJ1B8hUd4LQ==
+ type: ssh-rsa
+ varac:
+ key: AAAAB3NzaC1yc2EAAAADAQABAAACAQC8PN+jl30tI/EBqMqmVfmc0sfAqb+AWbBrOxic+ZZAbAOch+8SadhUd/67L6BCMANAdvJDRdwq86xbdnAhF9p5fQ8JYUVluvs6VAy4lDEx7N+ZSeKcQ7P1sp9OncdulBgaeK2vtEsjELm2e0yLkbLe8jBCFo4s9/cp0hEtc58+qvFkIlp9iycZOQWt3q0Uj6fM7V4nvT0y8QI6ta4Hwl5IMdSAi8GlwuwZwtrUtZ419sUR/L0ftRGr+SgHxwxL2AoiRpbXVaeIban6nvMUS7RAKGYMnXzG7i33nF9vM0LnbAWU2DNxTuzzJbbOyGXkzKn3kKgq5YNlMyxLxb1BsI6HRya5YDkvBF8IADhjrjDiAMYecRLsjpRa4XuCodHq6DVf5vlWBOpkh2FHHDHQ7VgWlwVXsvJyhNdVb679+aiu/u1/R2+UhjMo2BqXVMrNE7AtixyPj49DZrNtiIxriG4HGnEuRreCQVi6XmDDJid5ZBmqCJFQwYmeKZdRn1Rv2dd0423NXjQcg+6rvc67MhA/qgr/igwGsVebGa2mTb+cL0gIWekeSKEkVzRqXBlxNEzpZnbGt+A1cXRMag6BF1WDV5+I8WIp28q6c8eUBisR3xNkgtia8xdmXHSweEw3CYgT/Wy19vNbLpOtIPCLw1L313CtBmo42LdqG1bByIcUSQ==
+ type: ssh-rsa
+ config:
+ AllowTcpForwarding: "no"
+ mosh:
+ enabled: true
+ ports: "60000:61000"
+ port: 22
+stunnel:
+ clients: {}
+ servers:
+ couch_server:
+ accept_port: 15984
+ connect_port: 5984
+tags:
+ - amsterdam
+ - clientdev
+testing:
+ api_hosts:
+ - lynx.cdev.bitmask.net
+ api_uri: "https://api.cdev.bitmask.net:4430/1"
+ monitor_auth_token: 5mzpqxQET7CCZwvUvzT5IcwdPdbeyyFk
+x509:
+ ca_cert: |
+ -----BEGIN CERTIFICATE-----
+ MIIFbzCCA1egAwIBAgIBATANBgkqhkiG9w0BAQ0FADBKMRgwFgYDVQQDDA9CaXRt
+ YXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAaBgNVBAsME2h0dHBzOi8v
+ Yml0bWFzay5uZXQwHhcNMTIxMTA2MDAwMDAwWhcNMjIxMTA2MDAwMDAwWjBKMRgw
+ FgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAaBgNV
+ BAsME2h0dHBzOi8vYml0bWFzay5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
+ ggIKAoICAQC1eV4YvayaU+maJbWrD4OHo3d7S1BtDlcvkIRS1Fw3iYDjsyDkZxai
+ dHp4EUasfNQ+EVtXUvtk6170EmLco6Elg8SJBQ27trE6nielPRPCfX3fQzETRfvB
+ 7tNvGw4Jn2YKiYoMD79kkjgyZjkJ2r/bEHUSevmR09BRp86syHZerdNGpXYhcQ84
+ CA1+V+603GFIHnrP+uQDdssW93rgDNYu+exT+Wj6STfnUkugyjmPRPjL7wh0tzy+
+ znCeLl4xiV3g9sjPnc7r2EQKd5uaTe3j71sDPF92KRk0SSUndREz+B1+Dbe/RGk4
+ MEqGFuOzrtsgEhPIX0hplhb0Tgz/rtug+yTT7oJjBa3u20AAOQ38/M99EfdeJvc4
+ lPFF1XBBLh6X9UKF72an2NuANiX6XPySnJgZ7nZ09RiYZqVwu/qt3DfvLfhboq+0
+ bQvLUPXrVDr70onv5UDjpmEA/cLmaIqqrduuTkFZOym65/PfAPvpGnt7crQj/Ibl
+ DEDYZQmP7AS+6zBjoOzNjUGE5r40zWAR1RSi7zliXTu+yfsjXUIhUAWmYR6J3KxB
+ lfsiHBQ+8dn9kC3YrUexWoOqBiqJOAJzZh5Y1tqgzfh+2nmHSB2dsQRs7rDRRlyy
+ YMbkpzL9ZsOUO2eTP1mmar6YjCN+rggYjRrX71K2SpBG6b1zZxOG+wIDAQABo2Aw
+ XjAdBgNVHQ4EFgQUuYGDLL2sswnYpHHvProt1JU+D48wDgYDVR0PAQH/BAQDAgIE
+ MAwGA1UdEwQFMAMBAf8wHwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+D48w
+ DQYJKoZIhvcNAQENBQADggIBADeG67vaFcbITGpi51264kHPYPEWaXUa5XYbtmBl
+ cXYyB6hY5hv/YNuVGJ1gWsDmdeXEyj0j2icGQjYdHRfwhrbEri+h1EZOm1cSBDuY
+ k/P5+ctHyOXx8IE79DBsZ6IL61UKIaKhqZBfLGYcWu17DVV6+LT+AKtHhOrv3TSj
+ RnAcKnCbKqXLhUPXpK0eTjPYS2zQGQGIhIy9sQXVXJJJsGrPgMxna1Xw2JikBOCG
+ htD/JKwt6xBmNwktH0GI/LVtVgSp82Clbn9C4eZN9E5YbVYjLkIEDhpByeC71QhX
+ EIQ0ZR56bFuJA/CwValBqV/G9gscTPQqd+iETp8yrFpAVHOW+YzSFbxjTEkBte1J
+ aF0vmbqdMAWLk+LEFPQRptZh0B88igtx6tV5oVd+p5IVRM49poLhuPNJGPvMj99l
+ mlZ4+AeRUnbOOeAEuvpLJbel4rhwFzmUiGoeTVoPZyMevWcVFq6BMkS+jRR2w0jK
+ G6b0v5XDHlcFYPOgUrtsOBFJVwbutLvxdk6q37kIFnWCd8L3kmES5q4wjyFK47Co
+ Ja8zlx64jmMZPg/t3wWqkZgXZ14qnbyG5/lGsj5CwVtfDljrhN0oCWK1FZaUmW3d
+ 69db12/g4f6phldhxiWuGC/W6fCW5kre7nmhshcltqAJJuU47iX+DarBFiIj816e
+ yV8e
+ -----END CERTIFICATE-----
+ cert: |
+ -----BEGIN CERTIFICATE-----
+ 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
+ s02ix2KlFpLdIhrBNHsMbXPZ7mCgHQg27+Y=
+ -----END CERTIFICATE-----
+ commercial_ca_cert: ~
+ commercial_cert: ~
+ commercial_key: ~
+ key: |
+ -----BEGIN RSA PRIVATE KEY-----
+ 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
+ -----END RSA PRIVATE KEY-----
+ use: true
+ use_commercial: false
diff --git a/hiera/lynx.yaml b/hiera/lynx.yaml
index c031b27..86f5bef 100644
--- a/hiera/lynx.yaml
+++ b/hiera/lynx.yaml
@@ -87,9 +87,9 @@ definition_files:
soledad_service: |-
{
"hosts": {
- "zebra": {
- "hostname": "zebra.cdev.bitmask.net",
- "ip_address": "37.218.242.147",
+ "giraffe": {
+ "hostname": "giraffe.cdev.bitmask.net",
+ "ip_address": "37.218.242.191",
"location": "amsterdam",
"port": 2323
}
@@ -146,13 +146,18 @@ haproxy:
couch:
listen_port: 4096
servers:
- zebra:
+ giraffe:
backup: false
host: localhost
port: 4000
weight: 100
writable: true
hosts:
+ giraffe:
+ domain_full: giraffe.cdev.bitmask.net
+ domain_internal: giraffe.cdev.bitmask.i
+ ip_address: "37.218.242.191"
+ port: 22
lynx:
aliases:
- api.cdev.bitmask.net
@@ -163,12 +168,6 @@ hosts:
host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwEsXoJcsOryYgjdtF6ZwJ6iecjvG/TVyOTcfdYJCPzZXA3Pj6CPmq0R1HrfnQLq3orgQG+uxAFdkJw3jFTJVYI47MWigfFum10Mu8/URGANd50Ahn0NxRBAqgjSBog5r9xEDPc1OLur91VHCV95sKK+Qfh18h9MGdyB2ypN4puON1JXLkxdUmlOt80vs5tX6mLTik9JzV6QQrJN0I2GZfVWg46y0jPQehl3OS+3z8Z4RBKXUaxQPoHx/G+VukUL76hQUMlqEzH2pF9nrkkM1uHDOftBBeiWZo3X/89ljsrDrP9wurQ+/bzEUiEbg3ZW1ZIe/T3FFrAUi2r3giyEEf"
ip_address: "37.218.242.146"
port: 22
- zebra:
- domain_full: zebra.cdev.bitmask.net
- domain_internal: zebra.cdev.bitmask.i
- host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwEsXoJcsOryYgjdtF6ZwJ6iecjvG/TVyOTcfdYJCPzZXA3Pj6CPmq0R1HrfnQLq3orgQG+uxAFdkJw3jFTJVYI47MWigfFum10Mu8/URGANd50Ahn0NxRBAqgjSBog5r9xEDPc1OLur91VHCV95sKK+Qfh18h9MGdyB2ypN4puON1JXLkxdUmlOt80vs5tX6mLTik9JzV6QQrJN0I2GZfVWg46y0jPQehl3OS+3z8Z4RBKXUaxQPoHx/G+VukUL76hQUMlqEzH2pF9nrkkM1uHDOftBBeiWZo3X/89ljsrDrP9wurQ+/bzEUiEbg3ZW1ZIe/T3FFrAUi2r3giyEEf"
- ip_address: "37.218.242.147"
- port: 22
ip_address: "37.218.242.146"
location:
country_code: NL
@@ -199,7 +198,7 @@ mynetworks:
- "37.218.240.50"
- "37.218.242.145"
- "37.218.242.146"
- - "37.218.242.147"
+ - "37.218.242.191"
- "37.218.242.213"
- "37.218.242.214"
- "37.218.242.215"
@@ -275,7 +274,7 @@ ssh:
key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDnqWoPwiIAylx7wncIz3dl1Pi14/vr9El2tCb3E/nVfbX5VoGyHP8jnGkbaxwWZoTbSXl+ZlUz1Tw0qwDOQleVHXaUVmKZc8ni5crW6G1wGGEfE4ncSn35JWjFcZJTKq7a8DmQuDZDpUdbmz/XFtO3bu8DjpyNW2+7Fn+wHZPWXoDnjQBNryCS0M13thlH8PoGvm9rfRKn9upaTYV7hmF2FmQfMIq68x40DBeKCXA2VomFqeBIjZ/kDQJBZDbTrlp8lIX5h+qqHjJ6cPJvKeMSAaR3mXB4yekFOFcKZJqfFaRiJ1qxpHCdAwxxsklI+8e+CBCh2pJB3TBrJliccwwv
type: ssh-rsa
meskio:
- key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDxvvyrwMY5YudFkEglDDFqJorAojQ/pUTSO/k5vxPRTt8J/EvnkkLxnkAOMLb1kEkCxtp/TRT9HbgL/uOvFDdUEX8IKGn+oKZfXITqVbVzXyC9VtvdbhnZNYi8hWyVDo/DAFIX64LMtR+k8vLAyM2EmjWvj4+TZ8UBQT66tz7DhhZGsQNiSwPvIQJ1x42QMd7Bj8JOW2n/HCuoJUm5PTJkjSbhmHyz5xh4MVFmctvTv8b0UFBtcisirWq8NPYs+0HTWKDVYNnLF/wYDyFTj76PhE/0Je5REJkAw9AIaOQ2KvRxIQ3qOwJcPe4yJytFTtTe6ta00r0PHHSBL+08WbCz
+ key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDU6cVvh+1LYRYNff17s06E2ZBN5M5VEMYP15JNvM05ARNF7UuLuq0o9CrVRxFIknGBHOB2mtf0Tnc2opbJiq3fOJ/YKv2DBLcm+mrJvJC8gqi1JP76bUEETfuwkB2RHbzvJtDRo991IQcLaKpPjXQ4DBSdKgo4cldQVcpRFGmy3S7IsUjUmvfY/StyHc8bux2yjBDyzUdEA7MiXl7Vu6HA6xD5B+QYO71QVyfl2cYaJ10cxrVE1lJaqLjku8UoaKP1FU4PiLY2or2J1sQEvuhkxoIvYUPpIqEmH43ZeFLxTBMUv2leJs8BmKygzcW35jzZcsK5t23hp40gU7DOX8A1
type: ssh-rsa
micah:
key: AAAAB3NzaC1yc2EAAAADAQABAAACAQC5xvAs8c8KmJ/Lt2TiYthxOVEgUkprbLWVOwK1Hmc+3h6rV4iyT//8dv8Ov79ZMOAuqQhQ5fz7RckOTqoexW/kzbFhXw5NEt+eqHonayiAh8LVt2K79GbMtWmS2ss81ivDyQkaW3+PK5IDibsoOfNeuAZ17Hgudatjc4v7WEjVliYBwPLAA5DUZt8wf7nNQX3moHGE8A+d3S0UDQyEmT657D1p8jmrpg9qTL7nuvjZTq7v/mVErnIDUY83FGdrT1F+gPlCLetzSDeaNkYFm+RjVixF2pZKT+BsHkj/8nTJw7NBh/BTG34pSyuCmepwBBwPEISkfMAEA9Ag+TXq+Oe53GmmBa92asusM7XzyPTxUcvnUAp4kxn5i+65dDx4F2//cVe7+CNCdl8N5p88Xe3jmsTeEdEXnmXPFOBbvAE0kikDE30FqU06u/pLDy7ZG3JTZZtvvFuKrYokgQysDMLaxlMVMANs9WugJkOlexzOeDDgptPf8f2fQs2Q9Xo0xq1wrtD4kdopgtF1LLEFcUDKp7+nev+czzNWbv6ccZotlicZIqauYnBjjGPYz0sC4OCvZjz7bK7nDsdHoaZBSl1YUhTyLUDH2XH8V1lbEOJhfJSp+vZMJETIe8oP+uByEt01FIt8JsRhijXoKCPfXp59P9d3KS8vuaUsCEVrpkkalQ==
@@ -298,9 +297,9 @@ ssh:
stunnel:
clients:
couch_client:
- zebra_5984:
+ giraffe_5984:
accept_port: 4000
- connect: zebra.cdev.bitmask.i
+ connect: giraffe.cdev.bitmask.i
connect_port: 15984
original_port: 5984
servers: {}
@@ -330,7 +329,7 @@ webapp:
api_tokens:
allowed_ips:
- "37.218.242.146"
- - "37.218.242.147"
+ - "37.218.242.191"
monitor: 5mzpqxQET7CCZwvUvzT5IcwdPdbeyyFk
api_version: 1
client_certificates:
diff --git a/nodes/zebra.json b/nodes/giraffe.json
index eab84bc..b5b769a 100644
--- a/nodes/zebra.json
+++ b/nodes/giraffe.json
@@ -1,8 +1,5 @@
{
- "couch": {
- "mode": "plain"
- },
- "ip_address": "37.218.242.147",
+ "ip_address": "37.218.242.191",
"services": [
"couchdb",
"soledad"