From bcecdf371f7ef667eeb292374a97f22ccd29958a Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 21 Dec 2016 14:28:36 -0800 Subject: disable hippo --- files/ssh/known_hosts | 1 - hiera/alpaca.yaml | 1 - hiera/cat.yaml | 1 - hiera/donkey.yaml | 19 ------------------- hiera/lynx.yaml | 1 - hiera/snail.yaml | 1 - nodes/hippo.json | 3 ++- secrets.json | 8 -------- 8 files changed, 2 insertions(+), 33 deletions(-) diff --git a/files/ssh/known_hosts b/files/ssh/known_hosts index d5f816e..4a74237 100644 --- a/files/ssh/known_hosts +++ b/files/ssh/known_hosts @@ -12,7 +12,6 @@ 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 -hippo,hippo.bitmask.i,hippo.bitmask.net,85.17.92.143 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBL4iit51nt0P5yulG9s5iNP94MVGOXZTbPeHbnIqXmiYv8u5Cq8l/R4S9T8s9oh8PdZvGfWrbxewz3CaHgIvtbc= 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= diff --git a/hiera/alpaca.yaml b/hiera/alpaca.yaml index e585b66..37a8656 100644 --- a/hiera/alpaca.yaml +++ b/hiera/alpaca.yaml @@ -231,7 +231,6 @@ mynetworks: - "37.218.242.214" - "37.218.242.215" - "46.165.242.166" - - "85.17.92.143" name: alpaca nickserver: couchdb_nickserver_user: diff --git a/hiera/cat.yaml b/hiera/cat.yaml index 7be1a43..735bbd1 100644 --- a/hiera/cat.yaml +++ b/hiera/cat.yaml @@ -99,7 +99,6 @@ mynetworks: - "37.218.242.214" - "37.218.242.215" - "46.165.242.166" - - "85.17.92.143" name: cat platform: major_version: "0.9" diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml index 7d6d033..56b75bc 100644 --- a/hiera/donkey.yaml +++ b/hiera/donkey.yaml @@ -259,12 +259,6 @@ hosts: host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwEsXoJcsOryYgjdtF6ZwJ6iecjvG/TVyOTcfdYJCPzZXA3Pj6CPmq0R1HrfnQLq3orgQG+uxAFdkJw3jFTJVYI47MWigfFum10Mu8/URGANd50Ahn0NxRBAqgjSBog5r9xEDPc1OLur91VHCV95sKK+Qfh18h9MGdyB2ypN4puON1JXLkxdUmlOt80vs5tX6mLTik9JzV6QQrJN0I2GZfVWg46y0jPQehl3OS+3z8Z4RBKXUaxQPoHx/G+VukUL76hQUMlqEzH2pF9nrkkM1uHDOftBBeiWZo3X/89ljsrDrP9wurQ+/bzEUiEbg3ZW1ZIe/T3FFrAUi2r3giyEEf" ip_address: "37.218.242.214" port: 4422 - hippo: - domain_full: hippo.bitmask.net - domain_internal: hippo.bitmask.i - host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBL4iit51nt0P5yulG9s5iNP94MVGOXZTbPeHbnIqXmiYv8u5Cq8l/R4S9T8s9oh8PdZvGfWrbxewz3CaHgIvtbc=" - ip_address: "85.17.92.143" - port: 4422 leech: aliases: - api.demo.bitmask.net @@ -351,9 +345,6 @@ nagios: contact_emails: - micah@leap.se - sysdev@leap.se - disabled: - contact_emails: - - sysdev@leap.se mail: contact_emails: - sysdev@leap.se @@ -462,16 +453,6 @@ nagios: services: - webapp ssh_port: 4422 - hippo: - domain_full_suffix: bitmask.net - domain_internal: hippo.bitmask.i - domain_internal_suffix: bitmask.i - environment: disabled - ip_address: "85.17.92.143" - openvpn_gateway_address: "85.17.92.167" - services: - - openvpn - ssh_port: 4422 leech: domain_full_suffix: demo.bitmask.net domain_internal: leech.demo.bitmask.i diff --git a/hiera/lynx.yaml b/hiera/lynx.yaml index d8c37c9..dd4f87a 100644 --- a/hiera/lynx.yaml +++ b/hiera/lynx.yaml @@ -204,7 +204,6 @@ mynetworks: - "37.218.242.214" - "37.218.242.215" - "46.165.242.166" - - "85.17.92.143" name: lynx nickserver: couchdb_nickserver_user: diff --git a/hiera/snail.yaml b/hiera/snail.yaml index acb2a22..94be5ba 100644 --- a/hiera/snail.yaml +++ b/hiera/snail.yaml @@ -106,7 +106,6 @@ mynetworks: - "37.218.242.214" - "37.218.242.215" - "46.165.242.166" - - "85.17.92.143" name: snail obfsproxy: gateway_address: "37.218.242.216" diff --git a/nodes/hippo.json b/nodes/hippo.json index 906ea06..3d7b089 100644 --- a/nodes/hippo.json +++ b/nodes/hippo.json @@ -1,8 +1,9 @@ // http://torstatus.blutmagie.de/router_detail.php?FP=855b6cfe6c20a48cf1b815b87d565df6ea93e74a { + "enabled": false, "ip_address": "85.17.92.143", "services": ["openvpn"], - "tags": ["disabled", "amsterdam"], + "tags": ["amsterdam"], "openvpn": { "gateway_address": "85.17.92.167" }, diff --git a/secrets.json b/secrets.json index 5ce868b..0a660c3 100644 --- a/secrets.json +++ b/secrets.json @@ -58,14 +58,6 @@ "tor_family": "uSaR9IekHdQGUGIRrdThPFW64_JYgEnr", "webapp_secret_token": "_DLZ7e9YhU_d3HDCWFzCMd3WnC4QaP__" }, - "disabled": { - "scramblesuit_password_hippo": "GZ5FI5KQJUZVSTTYOI3XESDNOVEXQR2K", - "scramblesuit_port_hippo": 28975 - }, - "local": { - "scramblesuit_password_vpn": "IVVUGOCRPI2GOWSDKJGDK3STPFEHA53O", - "scramblesuit_port_vpn": 31761 - }, "mail": { "api_monitor_auth_token": "vv2LEtHFDmIcK4H2LsXTsI74Vt5IXKU2", "couch_admin_password": "5sICnwb5QCVHBcETILBhE8qUsZaF7Cuw", -- cgit v1.2.3