summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--files/nodes/otter/otter.crt33
-rw-r--r--files/nodes/otter/otter.key51
-rw-r--r--files/nodes/otter/otter_ssh.pub1
-rw-r--r--files/ssh/known_hosts1
-rw-r--r--hiera/ant.yaml4
-rw-r--r--hiera/hippo.yaml6
-rw-r--r--hiera/leech.yaml1
-rw-r--r--hiera/millipede.yaml4
-rw-r--r--hiera/otter.yaml286
-rw-r--r--hiera/thrips.yaml4
-rw-r--r--hiera/wallaby.yaml27
-rw-r--r--nodes/otter.json8
-rw-r--r--secrets.json2
-rw-r--r--tags/frankfurt.json8
14 files changed, 427 insertions, 9 deletions
diff --git a/files/nodes/otter/otter.crt b/files/nodes/otter/otter.crt
new file mode 100644
index 0000000..9d87884
--- /dev/null
+++ b/files/nodes/otter/otter.crt
@@ -0,0 +1,33 @@
+-----BEGIN CERTIFICATE-----
+MIIFoDCCA4igAwIBAgIQaGJRAiUW0T8cYmUyLojgZDANBgkqhkiG9w0BAQsFADBK
+MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa
+BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTQxMjAyMDAwMDAwWhcNMTUx
+MjAyMDAwMDAwWjAcMRowGAYDVQQDDBFvdHRlci5iaXRtYXNrLm5ldDCCAiIwDQYJ
+KoZIhvcNAQEBBQADggIPADCCAgoCggIBAOaw87Kuc+MNqZLf68ts/zcj1CHx0NEf
+1Dh4UfgdIHdB7c6nujYV5GcDezOqjiPlNAj00uvuIPGbACPbS7qDLbFhvgM6to8h
+iqSRPo0feLVoA5ZKH5c2+Anl8tP12nNi7KpdCOtDcPBD8mD/RP6Bm1sx9+g3dlbO
+LTGRyRMr4ehhXPiILmd4GfkdilRY/A2rxhvv4nBUx98fRh/5iuTzagb+z2jpDsoS
+KhhQO02B+Qkk+rZ1Csosz2310v6Bi2wfISnVOPQ48VkdxW6eygmoxwL/enQB2sTB
+qz+TrR5nVXKwuh3BfcjPb3E5gNpc1OoK4t0c88SrHfvuotwjTVO0epWPE94BF/8O
+2Oinis9jUrrXWwKvUENS3NRDmTFTEW8Gh+zEUXUJdkGT5+0vPhA1g7ZKhKvNErBz
+hSx1qb4Gn0LhK9dZff4wKIKeE1yXmxu6cOsaitFGtIl2Z5oxG4VenDjSeXAg6rwQ
+XkaRx5PPx7FuxZ7b6UEUM5kMlCV4kPv5T6k4Vd0NmkxDgaZu0OIeVfyiBy17yMiX
+VQXzyxlrZDV1qzDqs/0fdS9rlXECw3N/UsnQQphR7upuN/ngunWqaPNsf5GRPxpO
+Vz5Vjad5cqKQtZ2Nl3TuPIHCj0SxkJfkvqxOVZnGc2b8kLYXemxZCNUXY8pYVhq6
+qf6gJ8N01ryTAgMBAAGjga8wgawwHQYDVR0OBBYEFBDWjuGjZNQhPnK7Dk9RA2Xw
+bzYeMDMGA1UdEQQsMCqCD290dGVyLmJpdG1hc2suaYIRb3R0ZXIuYml0bWFzay5u
+ZXSHBC6l8qYwCwYDVR0PBAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+BQcDAjAJBgNVHRMEAjAAMB8GA1UdIwQYMBaAFLmBgyy9rLMJ2KRx7z66LdSVPg+P
+MA0GCSqGSIb3DQEBCwUAA4ICAQBEl1Y/wfDcWTx2gdG29hC/rmUH5fShJ1+yXphT
+S/GUoL+q/FErAUhwhNfwL5tu4MPA6D7IcV/kE3xCCmg0CSgaAX8ArzOCLIQne1qq
+MPvgDbZvyH6GjkudQaOl8X1juKg1VfoFVDktPWh2MqslHMTW+R1vQMrXodEmwbG9
+Y7uwEhCP5IShcgFWLt2NL7KFAta1TTrS4jE5YGtJFGmzbmO5/kmUCpGd40nVnhg3
+8jAYGVaZNUkZRn+re2uJ6uwCI0qMHKmJzCwJ37irz3rtga3YK03iPnAPBfT1soKP
+KyIsCV8/gFcdYMT1bQHT+is8nxHU8/p+5W6eb8pUGjvGJVY0l5x+5UdhT38lYyWe
+2UBg4e6rXy9rQe0ooWFOT+o0Hsox7tPBxILp+3zwtqFPlhO8RbZs1Q+RVSdD2bNl
+fRs8yi4CyfYuIawVP3H6wmNa0+CZaFJcDK705XilEywUL26QHDNpTbcTGAGw19rl
+uK6vPPBqRW9p9BVco3H4jEHpYtBKEL4gseRwsRlVfnLgkl3PBuilRgKgZ/Jb6JHt
+f0kUgmtX5GVyGvf4HeKBdu8qsj9NFLJ4EqBO9PQXkTfLBPbjPFEH6ukD0yMGWDTq
+EtrGJECc/vMc934hsTa7BRgS8IrIzxbK+ASCqXMYN+p9kCflV6TenVnT0Qz3A739
+Ilzbiw==
+-----END CERTIFICATE-----
diff --git a/files/nodes/otter/otter.key b/files/nodes/otter/otter.key
new file mode 100644
index 0000000..1710962
--- /dev/null
+++ b/files/nodes/otter/otter.key
@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----
diff --git a/files/nodes/otter/otter_ssh.pub b/files/nodes/otter/otter_ssh.pub
new file mode 100644
index 0000000..37825eb
--- /dev/null
+++ b/files/nodes/otter/otter_ssh.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCab6r51XEW9LjZVDZs3q/aIpn+oKo468ovivZIQPMmYMs6NUJ2z7Oc9YROAM3lfxcHHShNBIpxg/pSKnQ743hHavV3y+mEPbo4W3hbByuR6GJRaKxHP42NMfNxJUHpaix8jCrMkNypFGMss9C403quy62yGfN7hWIH/pWFR9z+GvWaLpl0J1T+sadeqYGrjiWPwmo88ZAo/RRsXEORyPMz/X7+pa+DvYrg9FqOnNNK0EvHI5asxRQMojpbt6DRpOkkDPkFZp/gpGRQCAbnaKtalkfC/HhbHepGiqQwMRphcpTmnJvOfIGy+YnUoV3RwoRzb5HAT6FkJ9c4gsTs+6Rp \ No newline at end of file
diff --git a/files/ssh/known_hosts b/files/ssh/known_hosts
index 47a09de..dd0d3a6 100644
--- a/files/ssh/known_hosts
+++ b/files/ssh/known_hosts
@@ -18,6 +18,7 @@ ladybug,ladybug.dev.bitmask.i,ladybug.dev.bitmask.net,199.119.112.8 ssh-rsa AAAA
leech,leech.demo.bitmask.i,leech.demo.bitmask.net,198.252.153.85 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCiT3/fejkQIAny1f71ijFYaSEcYho6gR10z20ctmLumV3pHtXcFXtHqzAFJ07txANyef5P/yiIOl+/x/uRANjo=
millipede,millipede.demo.bitmask.i,millipede.demo.bitmask.net,198.252.153.83 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBG02MrdDFaqZO11JbYSAAC5q/W/FCch3AQXo+dRcpErvHLmv9kWkrV1ESqfZ+s6qEfk8Aqv0vsym7YigMiGXlBo=
octopus,octopus.unstable.bitmask.i,octopus.unstable.bitmask.net,199.119.112.16 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLbvsEZGXVaC74PcXd/M4wwv7nnAhg3318EqcGbo2aX5Tt+mAYbxjLj+HAiJgG63Mp6+GEuH5KNwgrRNwaOqh84tOMOYOKFAdgha4z6WC9q9sFIkqwaE2KDfoENKyUo0ywb0aBAW0EvYMt92BL7p5T8oQr/SbFw/GW1iyEqCPFK4VcupdnjDd8wyolgLawg0Okah5IHVosuJQEZXii7I0nhAl5OUkn5DIr6NklW6gTht+m6yRl7KNS+SGfyZs5U/1NywtwqPIH5Zgwt3Cphzga+d++6HbpO3PXA1PmN/bYJGDC0zG9gDSae1mvc+pDWWELgHEfpjzigrqqeNJtO2UD
+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
panda,panda.unstable.bitmask.i,panda.unstable.bitmask.net,199.119.112.9 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2cA8eQ4VD3tW7p+Fy0ZLXBzFbgwFOXjdau8zQd0WzJd2sifsLMHv/iGcfELsK+O7Jh7KsezwhT+seZQR6QmdX4qgFvtKB86DgUmMVc5k1Zja1+vXjhsMVB0/EY7k7CM3Clm8NRJzjiA407TFYsCMLuVRaW5hvgFiH9+4aszbmtbfWoFVT97y3o2bkP0exz5jxgKsnlJDF9HJBsVEHXnozvopZeoprrDbtJZQGQA+HcllJm678sIzwEwWn/6JtH6LmcvhnRL5ohd0Tlhf/lqFS9if+EzEt278crUMWcePSxb7a4lV6cJrxE3VaiZ+ldsvJebcYDvtJCK1T8ea4OarB
seahorse,seahorse.unstable.bitmask.i,seahorse.unstable.bitmask.net,199.119.112.12 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfIO4Zdb7Xl1xP3Nw6hCSRSU9t6D2l3HpP38V1VM+2sLHDUdGDlHYWgUlfril5wZ6DdvU1DO2xrSTPDR1LrLEk/OKuFthnNUmRfE+NQQbf/KjEfj+AFj36l9evbWwef/EwECOtydQYZTEabVvrt0yprHYnfd728UklkFjXg67962X9A8DtK2OcPovEbcpPA3vo88+SZukNXAFUQcZPbX5ux0WZ1RH0GQVLVFo0dL4dQdEHZIXVYNvI9X7FzcN4WNjYyZfibiCmo3zdv15Hybh1NMQtBC6H5ZtiykzqL7cbUmmKeYzgIycFnewUxr6P4WyWx7/kPqfR/0Dw5aQqufw1
snail,snail.dev.bitmask.i,snail.dev.bitmask.net,176.53.69.14 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK+IgHh5d/DYKrfzc8yGSBiNxFOg8vnTTfuykuQK3wO9F7Obzxuux/qlvHV1yPV0I9id72bduDfyfngMU5jqugY=
diff --git a/hiera/ant.yaml b/hiera/ant.yaml
index 4b23333..fcfdc52 100644
--- a/hiera/ant.yaml
+++ b/hiera/ant.yaml
@@ -25,8 +25,8 @@ couch:
salt: e3ee9259723d0cbd8b3265dbe8b4e21e
username: nickserver
replication:
- password: pIUMKmtMce6XWxaNKbtdRvYaEpNufs69
- salt: 98a12f73893ac2e438f9ec18fd19c62c
+ password: 43IaTkRV_5bE2YgX6gPpCVcPsgKYEQ3t
+ salt: b9fc41d96052687645540af0ba178b83
username: replication
soledad:
password: cGqWZqTdFc_fuSZvfPtUTL_7uMA6d5YC
diff --git a/hiera/hippo.yaml b/hiera/hippo.yaml
index 110fc7a..4d62214 100644
--- a/hiera/hippo.yaml
+++ b/hiera/hippo.yaml
@@ -27,8 +27,8 @@ name: hippo
obfsproxy:
gateway_address: "85.17.92.167"
scramblesuit:
- password: KYZGWX27KJDGGYSIM5YUMZ3GMZNFCMTH
- port: 19378
+ password: GJBFKVRUNZRXKOKUKN2FAWSWLJ3XIWDC
+ port: 18093
openvpn:
adblock: false
allow_limited: false
@@ -105,7 +105,7 @@ tor:
bandwidth_rate: 100
contacts:
- sysdev@leap.se
- family: "deeruSaR9IekHdQGUGI,hippobagtc8Z3KPmfnT"
+ family: "deeruSaR9IekHdQGUGI,hippobagtc8Z3KPmfnT,otterbagtc8Z3KPmfnT"
hidden_service:
active: ~
address: ~
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index 025e994..d188a70 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -92,6 +92,7 @@ mynetworks:
- "204.13.164.162"
- "204.13.164.171"
- "204.13.164.57"
+ - "46.165.242.166"
- "85.17.92.143"
name: leech
platform:
diff --git a/hiera/millipede.yaml b/hiera/millipede.yaml
index d11ee68..6cf919a 100644
--- a/hiera/millipede.yaml
+++ b/hiera/millipede.yaml
@@ -27,8 +27,8 @@ name: millipede
obfsproxy:
gateway_address: "198.252.153.84"
scramblesuit:
- password: NVGFENCOPJDGCRLZHFGFMWRSG5YVSVSF
- port: 31278
+ password: LBRG2TCRGVGFE42NLFJTM5SUKI2DIVCX
+ port: 22642
openvpn:
adblock: false
allow_limited: false
diff --git a/hiera/otter.yaml b/hiera/otter.yaml
new file mode 100644
index 0000000..ae77a49
--- /dev/null
+++ b/hiera/otter.yaml
@@ -0,0 +1,286 @@
+---
+contacts:
+ - sysdev@leap.se
+development:
+ site_config: true
+dns:
+ public: true
+domain:
+ full: otter.demo.bitmask.net
+ full_suffix: demo.bitmask.net
+ internal: otter.demo.bitmask.i
+ internal_suffix: demo.bitmask.i
+ name: otter.demo.bitmask.net
+enabled: true
+environment: demo
+hosts: {}
+ip_address: "46.165.242.166"
+location:
+ country_code: DE
+ hemisphere: "N"
+ name: Frankfurt
+ timezone: "+1"
+mail:
+ smarthost:
+ - leech.demo.bitmask.net
+name: otter
+obfsproxy:
+ gateway_address: "46.165.242.169"
+ scramblesuit:
+ password: OVCGCNTDNMZWIYKDJZBDOWDLG4ZUGQJW
+ port: 31540
+openvpn:
+ adblock: false
+ allow_limited: false
+ allow_unlimited: true
+ configuration:
+ auth: SHA1
+ cipher: AES-128-CBC
+ fragment: 1500
+ keepalive: "10 30"
+ tls-cipher: DHE-RSA-AES128-SHA
+ tun-ipv6: true
+ filter_dns: false
+ gateway_address: "46.165.242.169"
+ limited_prefix: LIMITED
+ ports:
+ - "443"
+ protocols:
+ - tcp
+ - udp
+ rate_limit: ~
+ second_gateway_address: ~
+ unlimited_prefix: UNLIMITED
+ user_ips: false
+platform:
+ major_version: "0.6"
+ version: "0.6"
+service_type: user_service
+services:
+ - openvpn
+ - tor
+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: AAAAB3NzaC1yc2EAAAABIwAAAQEAypuIGD2h1ZDtIRvjyqKH1qM3XKxzG/JpOATpaAtI5h8+rf3OHeDUdvuPlQfTpZiAoWjU1xsiDrxqIVgdFNe5+1WB1tDAtJ7sGBNa2u8AQTpI9mqSiwf2lXS95b+8VV8yu6woGKXrytfdXffcGyVLfzwJFl0Fmdy2J3HrbzrXYVEGrJs1SRpZ+1U+KizRs1m2MugxhNxOTroM1kKuRsjRswTSkXoXHJ/fUd+dxdJJnEsyqA9uFAH+6ljJnPscwERkd0UsgaVIniSe43jM79qcwBhFiJKejquRaw282ncQghEQpR4xtYfSnWX6SgGkOAnN8vrGjm7o3xtK8YEjGWW0LQ==
+ 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: AAAAB3NzaC1yc2EAAAADAQABAAACAQDbZEkLGBE/VX9B+DhqAkWZMUc4HxxjyW0x1e2KRNWhrXY0nlLfl7d4OFdCMxy1nzVrCvfmdfP3tDrpPmeMrjqotWbgzhSIG63KhnVcVH6TouZ0NbsVMrNh/LscwlHr7sGoXjCOjHmuZMIr4Wfsasj1xvsgLUwUCIeXI8AXoaggBo2CGSDLtWpGO8aYcS4rVymxAXMwDf2s3cNXLbUQRb1o2Hx8VvGEYNRnrJzyPJKOEqJ7/xfnj0Ukdv3NY4sYfP0A41afcm0yZc1dxTZwletBB59szaN+APRT/TpbCQJqkcVnhNgKpv74pPTvQ/Kcr7hrmbTcpHxBF6BRElGiE8FQW/6NQpi+9PGd9AiRlAw/ZeGvMv/youfWnsgVXshlz50/PgRJNoHGz6DxR6sPulU/gpPpyWi4yy+bo3xUoa3jm1utlpoC+aO3wtYlQbS0ccmhDQwkyqLP09Yn9rTv30ZMNaCtUYX69Ju0adczaT9fIhbdbnuUpuhwrFX92Qy1W61mGFj3KkJcEj1vrJVncN8C56X/V936qzfRFr4ug9KgcN3dNJ0ISxzj5JUU1y+KJfVuTIAVxBO+OmVWH84AW44sYXps6b+kXoTU0Em8HfpBrRhhsbLXu0xyfAbRaA/P7/WDOlv9cLsgtg3VI9IBoZY6hlB8JhcJ8UhkiTgZE+WiLw==
+ type: ssh-rsa
+ micah:
+ key: AAAAB3NzaC1yc2EAAAADAQABAAACAQCx5Mo91TQoTMb1tTpX8sqVXkZXTHvRfvj3m9Tzq1M+W+uBInaZG8KYfws+qzyfzKrJYC9sNK1NW83TEyefdCON78dLkOyEft2DIZ8/2FAtjGYBA9DiUPlgHvRMsoYxk8E2KhGK6GAHO8rD/6aewyu9/REtmzcm059lj5qMpASv1x+fQb/9tLJbwJ/PEfw9a0UgpPqSNTrFGAoxNcRgSWOT6NfTEmAM5VS3V6nZaI+wLS649YrqaxIQOTUgLREBVermepyyteavXJJfT8gTv9diBKyHC7rjlDF5Aca4b1PYBwYnxLVUr6onPJBqrmfKvJ3G5F4RfaerizW+txcL9iSou9Mk3FIzV0E5Uj8tpVdCqp19w/w/N0eiDroez0WpBdO/pqjcRGLctrGYzjEPtrOE2KUsAgdmVqGFbcL+DBpN/oILPv4CbnJeQWySBtsOoHaawvB0ZFbMwrCffHsgGfqTEhh3XGevtObCLN2RjZQ5cq1uH5J9iXkg914XK4f/ODZVVT2IPcv5KJLiu0XFDSfIME+GRSZG0pMVdgik/FtjazxwZTCAvRjd5chbI52QSUhp/lxPI0pZKMw+U9b2e4fKB92j72C4Ynjpn7eN5UKv/deWgQohFhaGeBvK93tHQdNmnjYXGu7mCsQdXOgdopdMmeZmmW5mm5FoVUZl8Jl3tw==
+ type: ssh-rsa
+ monitor:
+ key: AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAFqCXlaYmqZqbefpMBaMPqzjhYNaxejlOX/x8YCXsDN2HMfeb/E/FYfpEPCuLVJ5Z0aDkp76JL9i1CX/9Rcbq4DEQEc6vkEv79MOI2jfUCVVeWRcybvRK0YAT9eQK59+FgNDbEo2NCUWBRvKd+8TjzZ7GtCLDnGd6+gkr6orkiA3uus/A==
+ type: ecdsa-sha2-nistp521
+ varac:
+ key: AAAAB3NzaC1yc2EAAAABIwAAAgEAnMA/JCaz/BMTZqhW+/h06ZZewhaYqMrmrgwXI1Ui6r9QkGzPy89ZB+86LV/tvZOJSWsT/CfN+zqRqDRH8ApnOuXsnmU1BF+Y/dXpLH8Z7t52yBwCVpQII4m29zZT9mfcyb5ZV6Rxh+BOChFERPkZwQJaMI9KU4nkmcKvgpOEbPfvXrv7aYy+G1YddMfmitWKpljL4VB+DVuKh7/Csxs9B8g8wy261rbVJDCvP2cblFA6nAuxk0UB/UFgA9VgjoNA/s2cXIsPDFvvHKoy6bDN0V7CQr3391eGv66KCoQIPCIkI6PY2MImA+Lx1jYQwEQUIJVm/KbuPFrm0GF/LSs5T+mNcFTyU+saSCOi1sxkCNtAikvvjzk9xg0W6RkR9ITZy3+3cKPhbHCd1qOMAxVvMCrN5s+bK2Ps5+wE1pxxz//owcRgsR0yk3kg/V5h716qL5EaWyh5XJoWbrlwzrXLW9ofceGBmqYv7dLKrXd3hwCzJqdZVtWSTePz1gB84rgCAwXhjofY3mwXSRjqQCu9RTImSpepKRCAEBujMHCK38aXR1IAXbenOWCQso05gMFdtlHY7DfvtmsT0xElbQXztKCBqtNrYoDf1+eQBOpveCK4n0gSivmo2NqDkw8R+1nW+CMo6eO3Qsfc3BXkJyufcOCsDjg1IXOP/fhWeNXqSL8=
+ type: ssh-rsa
+ mosh:
+ enabled: true
+ ports: "60000:61000"
+ port: 4422
+stunnel:
+ clients: {}
+ servers: {}
+tags:
+ - demo
+ - frankfurt
+tor:
+ bandwidth_rate: 6550
+ contacts:
+ - sysdev@leap.se
+ family: "deeruSaR9IekHdQGUGI,hippobagtc8Z3KPmfnT,otterbagtc8Z3KPmfnT"
+ hidden_service:
+ active: ~
+ address: ~
+ key_type: RSA
+ private_key: ~
+ public_key: ~
+ nickname: otterbagtc8Z3KPmfnT
+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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
+ Ilzbiw==
+ -----END CERTIFICATE-----
+ client_ca_cert: |
+ -----BEGIN CERTIFICATE-----
+ MIIFpzCCA4+gAwIBAgIBATANBgkqhkiG9w0BAQ0FADBmMRAwDgYDVQQKDAdCaXRt
+ YXNrMRwwGgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MTQwMgYDVQQDDCtCaXRt
+ YXNrIFJvb3QgQ0EgKGNsaWVudCBjZXJ0aWZpY2F0ZXMgb25seSEpMB4XDTEzMDEy
+ MTAwMDAwMFoXDTIzMDEyMTAwMDAwMFowZjEQMA4GA1UECgwHQml0bWFzazEcMBoG
+ A1UECwwTaHR0cHM6Ly9iaXRtYXNrLm5ldDE0MDIGA1UEAwwrQml0bWFzayBSb290
+ IENBIChjbGllbnQgY2VydGlmaWNhdGVzIG9ubHkhKTCCAiIwDQYJKoZIhvcNAQEB
+ BQADggIPADCCAgoCggIBAKaIdsRLSww0spDI9YzyBw4HKBJ+TdArzKcaspjdK9Tt
+ Utn6CgMnsVzSToNXNOjjqvlUbqqIcuLil7b1ALW65phadZ0BA31fZz1bPDO/hIua
+ UTSz8OhS93oRmgs22NOe/181YQgF1whhrPO4B7NzvZn6bNQnt96LAvBv74vfBacB
+ Vcp+yuvkBFT9Dh3v0ndLwu8WAL+Q54onoQvGge29MQkIs3l8xgOySUtl7lv04K0H
+ CV6tXRm3rrm9nI1RVaXUU5gfKuYT1V7NQIfrWjFrubpqhmwSp75mqLJya56k8C3o
+ mEoeL6pTXxMKIM/rpwnEweGNlHsEF7b1TF8jIxCSav1IMMR4APLLt6DLnwcKb+ix
+ IUeWU8QU9J7LyjyRPNKftsk2rp+ubsogjZ4sWBsEinB8jWjfVASmN+I2JV0a76ow
+ hmmHsm+2+2NPD3iQDi30yKpxNyhH3C0aoL7QqndC2/wNygYrM2wsiA2+Zic22s9b
+ //OVDdxQk5On3PwKiQZ2ZDrHapXjJeHQ1e3GeWn8EYwzwE0R7kDL6sDra8hH/1xY
+ sp8ZdEH9fDqjgtiKNEeevPzeGp321A8c7whkGdN926ihA9fsQ1jzEgQOJVBJd5Xa
+ GUWFPMDE6Xok3I1mXzvjJIgB8lqPf/gb4YvBV+lmEx8BxZIxQYonVQHFdZbD3sHt
+ AgMBAAGjYDBeMB0GA1UdDgQWBBSHfhO27FhbFFmofb2bj72ezvmibDAOBgNVHQ8B
+ Af8EBAMCAgQwDAYDVR0TBAUwAwEB/zAfBgNVHSMEGDAWgBSHfhO27FhbFFmofb2b
+ j72ezvmibDANBgkqhkiG9w0BAQ0FAAOCAgEAV8gHJY9Dh65P8hwlOUQHv5XMWIzI
+ idrtmeM0+OojShAJWSOqRxlHYcPn9i4hgMPRSkoZrmmEJLZESqD5EM0NcYwvYgQC
+ hn99fkTUnehHFZcLUALcmi/qk1rKI19+jB3XRIJWeppFJZjWyjwbdJ0z/4LoviF9
+ gSfMgNck2llR0BNdPXG3re+zH8uWNEu9PAGYQ+P3E4NOkufFV1Mg1w4wlQdYAUQl
+ AnwOn6NtKOlnPK/Hp+wTVxJ2UzzJydQPetRPO/OMNVNOSdkTDSqcYdT22rO5AHlF
+ YJFESKnwSIWHiK48CEhUNLKCyy88V0YkOWnKGI5KVsA83RtFQq1JJp5q6k4Bp2WC
+ Ivio1xK+D9VksRaCJuBV1MalPsxczDCaTaGsgzeFUgTvskcWKSEOjYp2B0+gccMu
+ menJXRdodW1Tt9WIYdxygm5Q36M9XAH8DV0/DRcB51sdMGQs0Wd7NmNXFr1aF9YB
+ Yh4cJPsT/9qSF0Y1QfzaTVSZ/AoFP4K1I5JixUMTz9DHT+TqQ/6lygQMM41PtnrM
+ 6Kjuibkno2UVk/Y3FyjSxiYyGvHOC53Xi4qScSVZ5ejVkAP05WuH7IpsFzDtJK6K
+ xIAokTRYLx/6lq8bwelCPGVjy7EsGXt9aN+gMb4R3L9vA/NQrXu+dmCJKPE1vUHF
+ gkVBxxt/s0R2aKM=
+ -----END CERTIFICATE-----
+ commercial_ca_cert: ~
+ commercial_cert: ~
+ commercial_key: ~
+ dh: |
+ -----BEGIN DH PARAMETERS-----
+ MIIBngKCAZcAsTaQV6TwbN9PpD6dYdXz0lA0drrXLRvS8rNoMTaDnIv134RwKwsb
+ p6nz2rYVMBdFWH8aiR5PZnByu2XKm6WUCLpYfWyGWr2FkQoCNCeqVkuxxTOf6Pol
+ T6JKJmRClsg/v3nffptoYvzvbLwRJu2lsiRGRUK/TvjJtOl0UIYz0Xtc3b387lLl
+ bhFyri/TF4YzP9dS/UNDRM9yeBUTNsnSTK0fktMyXwmpB5V7viiNeXLzZ28sQUZl
+ 7YmacrOtj6bXqnlYBftshAaGg24rAI1aBziflXiIqOwcUNVEs55vNV8FnLww/JDu
+ 1DW9e55mOQHJCTIMfa1bp9uFGiZvxP2yaY2kgaAFYItjY9tCoWI6+vYXWH0uLIc3
+ MktM1RDPR7AJDWlu6jiUangFTIX9S0bkfLtbZIxENQWzTxiXHD2mJCBJvFxQgtw3
+ fMHUS+wYpA2KwiDfcBnp3uUSAhbJTERMXTPGeQ4MFDlhdHiLGp8ux43NIG6AOWdF
+ Drr+AcevR5Iu9Sk6laUOZrYiK0FKPq07Ytn+WSKa3wIBCw==
+ -----END DH PARAMETERS-----
+ key: |
+ -----BEGIN RSA PRIVATE KEY-----
+ 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
+ -----END RSA PRIVATE KEY-----
+ use: true
+ use_commercial: false
diff --git a/hiera/thrips.yaml b/hiera/thrips.yaml
index 62ab355..ea2115b 100644
--- a/hiera/thrips.yaml
+++ b/hiera/thrips.yaml
@@ -26,8 +26,8 @@ couch:
salt: e3ee9259723d0cbd8b3265dbe8b4e21e
username: nickserver
replication:
- password: pIUMKmtMce6XWxaNKbtdRvYaEpNufs69
- salt: 98a12f73893ac2e438f9ec18fd19c62c
+ password: 43IaTkRV_5bE2YgX6gPpCVcPsgKYEQ3t
+ salt: b9fc41d96052687645540af0ba178b83
username: replication
soledad:
password: cGqWZqTdFc_fuSZvfPtUTL_7uMA6d5YC
diff --git a/hiera/wallaby.yaml b/hiera/wallaby.yaml
index 6a55c6d..1e7d972 100644
--- a/hiera/wallaby.yaml
+++ b/hiera/wallaby.yaml
@@ -49,6 +49,27 @@ definition_files:
"host": "millipede.demo.bitmask.net",
"ip_address": "198.252.153.84",
"location": "seattle__wa"
+ },
+ {
+ "capabilities": {
+ "adblock": false,
+ "filter_dns": false,
+ "limited": false,
+ "ports": [
+ "443"
+ ],
+ "protocols": [
+ "tcp",
+ "udp"
+ ],
+ "transport": [
+ "openvpn"
+ ],
+ "user_ips": false
+ },
+ "host": "otter.demo.bitmask.net",
+ "ip_address": "46.165.242.169",
+ "location": "frankfurt"
}
],
"locations": {
@@ -58,6 +79,12 @@ definition_files:
"name": "Amsterdam",
"timezone": "+1"
},
+ "frankfurt": {
+ "country_code": "DE",
+ "hemisphere": "N",
+ "name": "Frankfurt",
+ "timezone": "+1"
+ },
"seattle__wa": {
"country_code": "US",
"hemisphere": "N",
diff --git a/nodes/otter.json b/nodes/otter.json
new file mode 100644
index 0000000..47da31f
--- /dev/null
+++ b/nodes/otter.json
@@ -0,0 +1,8 @@
+{
+ "tags": ["demo", "frankfurt"],
+ "ip_address": "46.165.242.166",
+ "openvpn": {
+ "gateway_address": "46.165.242.169"
+ },
+ "services": ["openvpn", "tor"]
+}
diff --git a/secrets.json b/secrets.json
index 5208dcc..e0bb521 100644
--- a/secrets.json
+++ b/secrets.json
@@ -37,8 +37,10 @@
"nagios_test_password": "CsdFzBeYX6bepZdbzvaN6Dbu5NPz6Ycv",
"scramblesuit_password_hippo": "GJBFKVRUNZRXKOKUKN2FAWSWLJ3XIWDC",
"scramblesuit_password_millipede": "LBRG2TCRGVGFE42NLFJTM5SUKI2DIVCX",
+ "scramblesuit_password_otter": "OVCGCNTDNMZWIYKDJZBDOWDLG4ZUGQJW",
"scramblesuit_port_hippo": 18093,
"scramblesuit_port_millipede": 22642,
+ "scramblesuit_port_otter": 31540,
"tor_family": "bagtc8Z3KPmfnTUTJhZeJ4TrIECfHHRr",
"webapp_secret_token": "GgKvW3NhAKwgvQuMAzdHhLDBh3g3u5Xd"
},
diff --git a/tags/frankfurt.json b/tags/frankfurt.json
new file mode 100644
index 0000000..94325cf
--- /dev/null
+++ b/tags/frankfurt.json
@@ -0,0 +1,8 @@
+{
+ "location": {
+ "name": "Frankfurt",
+ "country_code": "DE",
+ "timezone":"+1",
+ "hemisphere": "N"
+ }
+}