diff options
| -rw-r--r-- | hiera/cat.yaml | 1 | ||||
| -rw-r--r-- | hiera/donkey.yaml | 26 | ||||
| -rw-r--r-- | hiera/orangutan.yaml | 374 | ||||
| -rw-r--r-- | nodes/orangutan.json | 3 | 
4 files changed, 28 insertions, 376 deletions
diff --git a/hiera/cat.yaml b/hiera/cat.yaml index 038b138..1c48baf 100644 --- a/hiera/cat.yaml +++ b/hiera/cat.yaml @@ -98,6 +98,7 @@ mynetworks:    - "37.218.242.213"    - "37.218.242.214"    - "37.218.242.215" +  - "37.218.247.46"    - "46.165.242.166"  name: cat  platform:  diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml index cffb9f0..d8e90ea 100644 --- a/hiera/donkey.yaml +++ b/hiera/donkey.yaml @@ -297,6 +297,16 @@ hosts:      host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwEsXoJcsOryYgjdtF6ZwJ6iecjvG/TVyOTcfdYJCPzZXA3Pj6CPmq0R1HrfnQLq3orgQG+uxAFdkJw3jFTJVYI47MWigfFum10Mu8/URGANd50Ahn0NxRBAqgjSBog5r9xEDPc1OLur91VHCV95sKK+Qfh18h9MGdyB2ypN4puON1JXLkxdUmlOt80vs5tX6mLTik9JzV6QQrJN0I2GZfVWg46y0jPQehl3OS+3z8Z4RBKXUaxQPoHx/G+VukUL76hQUMlqEzH2pF9nrkkM1uHDOftBBeiWZo3X/89ljsrDrP9wurQ+/bzEUiEbg3ZW1ZIe/T3FFrAUi2r3giyEEf"      ip_address: "37.218.242.145"      port: 22 +  orangutan:  +    aliases:  +      - api.singlenode.bitmask.net +      - nicknym.singlenode.bitmask.net +      - singlenode.bitmask.net +    domain_full: orangutan.singlenode.bitmask.net +    domain_internal: orangutan.singlenode.bitmask.i +    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6CLnQYeLzaW6dlLuyv0GFzEt6rIm0Bi0G19wKp8DpBanw5x+t+q1hnHkfJIKN/AJ6EGV10tnuM0qLUUl1LASijF+DEaygKkChHLxYmR91Em9lB/QOGIYgwtsKhBBecJJ5ZnoNOshLQs2j3qy0yCGZBnVG/v3rdtIFYYOo3/B+JSGMqos4yv0uAfv7itMtpQGqh1qy9a/2C2SyNNwssTLacf+2HHhInXdSvoMhgumRl6gpf46tqtKV4XB+8huhS4xOjQtYd4rPlZHvzgTg/uWHhSYitgT/DcQz+Z9ewzHetU+K4gvuNVs4IHRa1+8TH/8/d71FOp0T1/u+1eSNvTV/" +    ip_address: "37.218.247.46" +    port: 22    otter:       domain_full: otter.demo.bitmask.net      domain_internal: otter.demo.bitmask.i @@ -331,6 +341,7 @@ nagios:      - demo.bitmask.i      - dev.bitmask.i      - mail.bitmask.i +    - singlenode.bitmask.i      - unstable.bitmask.i    environments:       clientdev:  @@ -351,6 +362,9 @@ nagios:      production:         contact_emails:           - sysdev@leap.se +    singlenode:  +      contact_emails:  +        - sysdev@leap.se      unstable:         contact_emails:           - sysdev@leap.se @@ -500,6 +514,18 @@ nagios:        services:           - backup        ssh_port: 22 +    orangutan:  +      domain_full_suffix: singlenode.bitmask.net +      domain_internal: orangutan.singlenode.bitmask.i +      domain_internal_suffix: singlenode.bitmask.i +      environment: singlenode +      ip_address: "37.218.247.46" +      services:  +        - couchdb +        - mx +        - soledad +        - webapp +      ssh_port: 22      otter:         domain_full_suffix: demo.bitmask.net        domain_internal: otter.demo.bitmask.i diff --git a/hiera/orangutan.yaml b/hiera/orangutan.yaml index 38c73ac..61c1105 100644 --- a/hiera/orangutan.yaml +++ b/hiera/orangutan.yaml @@ -140,12 +140,6 @@ domain:  enabled: true  environment: singlenode  firewall:  -  monitor:  -    from: sysadmin -    port:  -      - 443 -      - 80 -    to: "37.218.247.46"    mx:       from: "*"      port:  @@ -180,119 +174,6 @@ haproxy:          weight: 10          writable: true  hosts:  -  aardwolf:  -    domain_full: aardwolf.unstable.bitmask.net -    domain_internal: aardwolf.unstable.bitmask.i -    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCu7OdNY9a35mW4nB7BpY0MaOJTNNPHYTZTMJyefhsjeKABoLGCy8RZhQ3evt1qVyAqTvOCjLdwNTedoaKzUlgBLDed5CR16WJLAmTWGSFR28kseyqo8A5+w98GAUjXiUvEZpaoxPh8LtBanlFA+5oVb3Z7c/S26MFF4CtAYeCgxKLtpX09P46DcHVAU75rx+Q+ffxXSPhU0KTRpkgdykhI2ytmrMoSckjJY+lqebKBilzKX5/BssRzVWfwszyTNINx33z5SpKr2OBeO80iWB9XejNMvN76PIFgihHs4aDrWXiJQDTmfLF3PMdebaXKbwbxE5IgvbieUYba+egLtSf1" -    ip_address: "199.119.112.205" -    port: 22 -  alpaca:  -    aliases:  -      - api.mail.bitmask.net -      - mail.bitmask.net -      - nicknym.mail.bitmask.net -    domain_full: alpaca.mail.bitmask.net -    domain_internal: alpaca.mail.bitmask.i -    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDtpKckyjDgSw555znY6Ww2ZHzYZvNkf/dm6Xml4SVM4hFTUVIhgAuFXoUcMjwOcAzbnqPdZN/zGCzTGGBnPrw9YvwaP2oso1b/tysEGYvemvxJlLxo7wQKLbTj8u89LahGFZhoUBFxIX6u0f4gBFURGKHgotyjRJq5tM19CjgnO7L3lhjXl/04Zd5mmQPoHuGNi8wjxZVHLi+cbmG1qXFIXhqb1nDjq2dJh+NJGRZ4IrkkNYYB/V1RlQvHfJ6eof7pyVUWLwyOBe11DkyOooKl/pOkH4jVVCKP2Asbdu7nlqq6il88pQpL0CsikikWvMgWJ9TqafI2kBJ6QX484foH" -    ip_address: "199.119.112.223" -    port: 22 -  ant:  -    domain_full: ant.demo.bitmask.net -    domain_internal: ant.demo.bitmask.i -    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBGDhCu92zulHOAhv63sTLnxPQrP+GxbWC4YUxonYOiWKaI/oS5soH5vfgI0/kkzZgA044F6ZyWo5S5dEwz4AEI=" -    ip_address: "198.252.153.82" -    port: 4422 -  cat:  -    domain_full: cat.unstable.bitmask.net -    domain_internal: cat.unstable.bitmask.i -    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVZjxA6lge9gk9jtZRhYtXNZK0wp2QjrwEi9Vh7xSNku6RalawG3RrVfDsbZ4cAjkF4lUINuyEucppeOC7FdDMN/HGo1tPdRs10zow4xNGaPm9XOeWVi53l2nIvu95IlQDh7XTLkhHmjELNvnQPc/BfZrM8MBjqZxJLNTUw117D06dtSomELEjemyMA9DAReFe3gbymUyhmH8Brre9lYeIa26yoMD8fSk1tfBRlq30YhblswWGSogEPW5AupfbS1Lb4KjqeGBwFJIvc8pxibmEVT9IiEGd72TPXipQ/iyHq011lnzzvLRhqjE6CUc4gNRU+R0sfF1isQmSfW/FGqdr" -    ip_address: "199.119.112.206" -    port: 22 -  clam:  -    domain_full: clam.dev.bitmask.net -    domain_internal: clam.dev.bitmask.i -    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwEsXoJcsOryYgjdtF6ZwJ6iecjvG/TVyOTcfdYJCPzZXA3Pj6CPmq0R1HrfnQLq3orgQG+uxAFdkJw3jFTJVYI47MWigfFum10Mu8/URGANd50Ahn0NxRBAqgjSBog5r9xEDPc1OLur91VHCV95sKK+Qfh18h9MGdyB2ypN4puON1JXLkxdUmlOt80vs5tX6mLTik9JzV6QQrJN0I2GZfVWg46y0jPQehl3OS+3z8Z4RBKXUaxQPoHx/G+VukUL76hQUMlqEzH2pF9nrkkM1uHDOftBBeiWZo3X/89ljsrDrP9wurQ+/bzEUiEbg3ZW1ZIe/T3FFrAUi2r3giyEEf" -    ip_address: "37.218.242.213" -    port: 4422 -  demodex:  -    domain_full: demodex.dev.bitmask.net -    domain_internal: demodex.dev.bitmask.i -    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCx1qgYlN/Y69I0mn2NhjEw8RtSMw3XoQ79lushppGJlQse7lJx0fNyKc/xy/qxi0YSrgoXKm/gD4GaESqFglvIygDuNxiVyBDGUfCpPvmkp+q9eduBFL+UrIoLdsxpjx0hfLZfZ6YoXwGd44sK5pcn+5ov9h4HZCrjxDEAGr/Tg2hU+UXSV53136MZuGT4ylXZ3jIM6c6Pm9tBFSVH3TUuSmbzgCVTbvA2g6OqskMRACov0NrmADr8MfO6idRqIlZ/s8FmJOKtOjQMbQWq52PJ4yIEcaSUE0fmlERLnHVCrKfDojVOgXfeazHN9td2xojQTkT44rm/bqp1bx/QRss9" -    ip_address: "204.13.164.171" -    port: 22 -  diplocaulus:  -    aliases:  -      - bitmask.net -      - www.bitmask.net -    domain_full: diplocaulus.bitmask.net -    domain_internal: diplocaulus.bitmask.i -    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDpvETs31Zg2omqF9k3dq/CJDnZtrd+987VJgWex/zM/ZsRu7MYoAb34BBm2QroVwAiei5Wczn6CpdcYUuY38fdCxUVRKClm0abz0T6LT/EsqfY3N1d9OmAjN/XEWi/5+vnaiEuh313XUgD2vASFwLR+z9NHlGmz+uBaQLWRZF2Q36i2L7TOOxUG96i6knShNIGmaajVNhv078EtJlWbNzpEcVsn6CyRhyMdx0KzV2tIvitozwHcAy5UEQGGiwACxHwOS9IWn7UBHhfxf1kj1VVmnrewf6TnApvuqD8e0d9z+NnWOt9h3HAFxF92Ggs4FQ/vY7EcxgaEoW1kroGiNGP" -    ip_address: "199.119.112.150" -    port: 22 -  donkey:  -    aliases:  -      - api.unstable.bitmask.net -      - nicknym.unstable.bitmask.net -      - unstable.bitmask.net -    domain_full: donkey.unstable.bitmask.net -    domain_internal: donkey.unstable.bitmask.i -    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCzQJXmGyldmFNuUoUoZuf1N78/p5Wb0UYKlnKbx+ydwux1xMheVyoroheAd19Pc42nxKsdEi3qhlPTRoo+8IGluNgU+ptUE6x3490/AcaKsPZEkAsXpzMFYFki+YDPEfA3+Rlq8BmNZi4/EHtZwtPt907tKmojn3bc13i+4z/lQkHL/foe+NTveQ46UUa23ZEwRibZ7QZfmdk+hu3S2Dmz+JsHb5hxbUziSYUkbcm2lrhy7IEJyncwE2U4sVdlZmgnoNvgsbuvlhhDFGrFGXedD2BfxeYhjJj8Nga1y7BYdfFlodxczpEHiiLO8h1sbVhVUOxIdLu/e+ZfGuJfvFsR" -    ip_address: "199.119.112.207" -    port: 22 -  dotterel:  -    domain_full: dotterel.dev.bitmask.net -    domain_internal: dotterel.dev.bitmask.i -    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtwy1DFLdBQOTDwGLtlewA8hHcgz/q4nuW70BZnH3nlYFm4UqIm7KUMSCflDceNBcntedka2obzoeSEfa7j8ODzrBsrIebrPN50B3uM1svcfIivrVnNXHsAPiz2c7LBO5/+XuTfmLm0lrOeiBQxaDxo0GGqEFxo8/SFWgCtHNNSVLynroQl7uN50P3+h0G60XTJh/EYD8I6oM0cvL+a/vbBdJz3nTN/uDvDO9lATu9u1jk/L8Bo2388IOYwDibW1yg9nE3xjWX59bndod5hKrGczJ4v/hIyKxO8Bv+44whxws1qGy2s4JMbQWmt3HVy4U1wU1/ykc6ZDIjo9IJjJOR" -    ip_address: "37.218.240.50" -    port: 22 -  elephant:  -    aliases:  -      - api.dev.bitmask.net -      - dev.bitmask.net -      - nicknym.dev.bitmask.net -    domain_full: elephant.dev.bitmask.net -    domain_internal: elephant.dev.bitmask.i -    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwEsXoJcsOryYgjdtF6ZwJ6iecjvG/TVyOTcfdYJCPzZXA3Pj6CPmq0R1HrfnQLq3orgQG+uxAFdkJw3jFTJVYI47MWigfFum10Mu8/URGANd50Ahn0NxRBAqgjSBog5r9xEDPc1OLur91VHCV95sKK+Qfh18h9MGdyB2ypN4puON1JXLkxdUmlOt80vs5tX6mLTik9JzV6QQrJN0I2GZfVWg46y0jPQehl3OS+3z8Z4RBKXUaxQPoHx/G+VukUL76hQUMlqEzH2pF9nrkkM1uHDOftBBeiWZo3X/89ljsrDrP9wurQ+/bzEUiEbg3ZW1ZIe/T3FFrAUi2r3giyEEf" -    ip_address: "37.218.242.214" -    port: 4422 -  giraffe:  -    domain_full: giraffe.cdev.bitmask.net -    domain_internal: giraffe.cdev.bitmask.i -    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCucBWeL3Konoolf/3RHuhMCSd+GL+1wM9pyH8TiHATKN7wGbjcN+TbSthLca4qW8h5AwQWtwX2Fz0rzp5m3jrHMDH9C2kZdtV0SSv3EkG8qA19QL3UlOHI/cR959CvGEqDVn8qrnfEhp866NHNZ0Oy+eqfdYbrAGxsTOFJYhlxeAcgtPwDnunEfVyycmjgijx8VlNzb0iLFEUAlK4+wKubabrm1ZgiVIvJrivZ2oUrOvplOlo9WPwdYDZCahjsWxTHIMFtPxaJMQsE0jzu/BnwvMztVyyfpYypB/IVFMY/onADExB2BDbTu0mFpHskd+pQSLQnm7Yrf6/Jg8e1FoGv" -    ip_address: "37.218.242.191" -    port: 22 -  leech:  -    aliases:  -      - api.demo.bitmask.net -      - demo.bitmask.net -      - nicknym.demo.bitmask.net -    domain_full: leech.demo.bitmask.net -    domain_internal: leech.demo.bitmask.i -    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxGPMkrINVARV9unydaLMxf16JFa5HWv2OqUXlwRXrhlYP8pBBAEjZaXAi3LMee3byg+NHhofSgRWd76zMW5+vX8HqXVMtCpXRzMk+1EpjA7u8xYW1dWEDMLWCjbB4aB1D1NLTD9u6mn0xJCRIUrqFMrMPyh5xD2M1WPB0lEM7rH79Hm5N4QvKPd0bEFQAYSDlV/hdArp5B1OhQxI8ROu+f6JCA4HEe3+qO8BrtGb4V1dyAdYiViL1IMIYvjQoC0lZm86KAsVDkW8kApYc3js5taSVFYcL58SVcMekjA34klC9pdCxeJNjg9whQP0cAg4/U4C9V8mW/EhzHgXU5FpZ" -    ip_address: "198.252.153.85" -    port: 4422 -  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 -  millipede:  -    domain_full: millipede.demo.bitmask.net -    domain_internal: millipede.demo.bitmask.i -    host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBG02MrdDFaqZO11JbYSAAC5q/W/FCch3AQXo+dRcpErvHLmv9kWkrV1ESqfZ+s6qEfk8Aqv0vsym7YigMiGXlBo=" -    ip_address: "198.252.153.83" -    port: 4422 -  newt:  -    domain_full: newt.dev.bitmask.net -    domain_internal: newt.dev.bitmask.i -    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwEsXoJcsOryYgjdtF6ZwJ6iecjvG/TVyOTcfdYJCPzZXA3Pj6CPmq0R1HrfnQLq3orgQG+uxAFdkJw3jFTJVYI47MWigfFum10Mu8/URGANd50Ahn0NxRBAqgjSBog5r9xEDPc1OLur91VHCV95sKK+Qfh18h9MGdyB2ypN4puON1JXLkxdUmlOt80vs5tX6mLTik9JzV6QQrJN0I2GZfVWg46y0jPQehl3OS+3z8Z4RBKXUaxQPoHx/G+VukUL76hQUMlqEzH2pF9nrkkM1uHDOftBBeiWZo3X/89ljsrDrP9wurQ+/bzEUiEbg3ZW1ZIe/T3FFrAUi2r3giyEEf" -    ip_address: "37.218.242.145" -    port: 22    orangutan:       aliases:         - api.singlenode.bitmask.net @@ -303,24 +184,6 @@ hosts:      host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6CLnQYeLzaW6dlLuyv0GFzEt6rIm0Bi0G19wKp8DpBanw5x+t+q1hnHkfJIKN/AJ6EGV10tnuM0qLUUl1LASijF+DEaygKkChHLxYmR91Em9lB/QOGIYgwtsKhBBecJJ5ZnoNOshLQs2j3qy0yCGZBnVG/v3rdtIFYYOo3/B+JSGMqos4yv0uAfv7itMtpQGqh1qy9a/2C2SyNNwssTLacf+2HHhInXdSvoMhgumRl6gpf46tqtKV4XB+8huhS4xOjQtYd4rPlZHvzgTg/uWHhSYitgT/DcQz+Z9ewzHetU+K4gvuNVs4IHRa1+8TH/8/d71FOp0T1/u+1eSNvTV/"      ip_address: "37.218.247.46"      port: 22 -  otter:  -    domain_full: otter.demo.bitmask.net -    domain_internal: otter.demo.bitmask.i -    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCab6r51XEW9LjZVDZs3q/aIpn+oKo468ovivZIQPMmYMs6NUJ2z7Oc9YROAM3lfxcHHShNBIpxg/pSKnQ743hHavV3y+mEPbo4W3hbByuR6GJRaKxHP42NMfNxJUHpaix8jCrMkNypFGMss9C403quy62yGfN7hWIH/pWFR9z+GvWaLpl0J1T+sadeqYGrjiWPwmo88ZAo/RRsXEORyPMz/X7+pa+DvYrg9FqOnNNK0EvHI5asxRQMojpbt6DRpOkkDPkFZp/gpGRQCAbnaKtalkfC/HhbHepGiqQwMRphcpTmnJvOfIGy+YnUoV3RwoRzb5HAT6FkJ9c4gsTs+6Rp" -    ip_address: "46.165.242.166" -    port: 4422 -  snail:  -    domain_full: snail.dev.bitmask.net -    domain_internal: snail.dev.bitmask.i -    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwEsXoJcsOryYgjdtF6ZwJ6iecjvG/TVyOTcfdYJCPzZXA3Pj6CPmq0R1HrfnQLq3orgQG+uxAFdkJw3jFTJVYI47MWigfFum10Mu8/URGANd50Ahn0NxRBAqgjSBog5r9xEDPc1OLur91VHCV95sKK+Qfh18h9MGdyB2ypN4puON1JXLkxdUmlOt80vs5tX6mLTik9JzV6QQrJN0I2GZfVWg46y0jPQehl3OS+3z8Z4RBKXUaxQPoHx/G+VukUL76hQUMlqEzH2pF9nrkkM1uHDOftBBeiWZo3X/89ljsrDrP9wurQ+/bzEUiEbg3ZW1ZIe/T3FFrAUi2r3giyEEf" -    ip_address: "37.218.242.215" -    port: 4422 -  tuatara:  -    domain_full: tuatara.unstable.bitmask.net -    domain_internal: tuatara.unstable.bitmask.i -    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxCGm32xKS3Xds8QrUHwpaG2jb7hiFFoIc4UMVzreT7Vjq2KdospNUYvw0bfNKLb9YW6XpQAHrFRk+mn8+4VY3LIePDNsH21DRZl2MQSw7Kmuzrqy99rKQCeDAiiP0aTQXiFDpa34+Eh1Z4t4II1VKCDMKRv7+YKORIs1q+xzZv+ythaxikCT3AMbKbcTlpI/td0eIccBVfBm89kJI9RHZGZO2CVEj8Rcd0f+JtIM2cP08V+mlHCHgfgy8FXrI/G5egyFwC7/EiBOTseVBOiq8n9yfJUmYOCVzu6Er+We90Kj+OgYcj9Ap50MBi2ivZalrFeySooRmuU/OmC5vww0n" -    ip_address: "199.119.112.208" -    port: 22  ip_address: "37.218.247.46"  location: ~  mail:  @@ -353,232 +216,6 @@ mynetworks:    - "37.218.242.215"    - "37.218.247.46"    - "46.165.242.166" -nagios:  -  domains_internal:  -    - bitmask.i -    - cdev.bitmask.i -    - demo.bitmask.i -    - dev.bitmask.i -    - mail.bitmask.i -    - singlenode.bitmask.i -    - unstable.bitmask.i -  environments:  -    clientdev:  -      contact_emails:  -        - drebs@leap.se -        - sysdev@leap.se -    demo:  -      contact_emails:  -        - elijah@leap.se -        - sysdev@leap.se -    development:  -      contact_emails:  -        - micah@leap.se -        - sysdev@leap.se -    mail:  -      contact_emails:  -        - sysdev@leap.se -    production:  -      contact_emails:  -        - sysdev@leap.se -    singlenode:  -      contact_emails:  -        - sysdev@leap.se -    unstable:  -      contact_emails:  -        - sysdev@leap.se -  hosts:  -    aardwolf:  -      domain_full_suffix: unstable.bitmask.net -      domain_internal: aardwolf.unstable.bitmask.i -      domain_internal_suffix: unstable.bitmask.i -      environment: unstable -      ip_address: "199.119.112.205" -      services:  -        - couchdb -        - soledad -      ssh_port: 22 -    alpaca:  -      domain_full_suffix: mail.bitmask.net -      domain_internal: alpaca.mail.bitmask.i -      domain_internal_suffix: mail.bitmask.i -      environment: mail -      ip_address: "199.119.112.223" -      services:  -        - couchdb -        - mx -        - soledad -        - webapp -      ssh_port: 22 -    ant:  -      domain_full_suffix: demo.bitmask.net -      domain_internal: ant.demo.bitmask.i -      domain_internal_suffix: demo.bitmask.i -      environment: demo -      ip_address: "198.252.153.82" -      services:  -        - couchdb -      ssh_port: 4422 -    cat:  -      domain_full_suffix: unstable.bitmask.net -      domain_internal: cat.unstable.bitmask.i -      domain_internal_suffix: unstable.bitmask.i -      environment: unstable -      ip_address: "199.119.112.206" -      services:  -        - mx -      ssh_port: 22 -    clam:  -      domain_full_suffix: dev.bitmask.net -      domain_internal: clam.dev.bitmask.i -      domain_internal_suffix: dev.bitmask.i -      environment: development -      ip_address: "37.218.242.213" -      services:  -        - couchdb -        - soledad -      ssh_port: 4422 -    demodex:  -      domain_full_suffix: dev.bitmask.net -      domain_internal: demodex.dev.bitmask.i -      domain_internal_suffix: dev.bitmask.i -      environment: development -      ip_address: "204.13.164.171" -      services:  -        - backup -      ssh_port: 22 -    diplocaulus:  -      domain_full_suffix: bitmask.net -      domain_internal: diplocaulus.bitmask.i -      domain_internal_suffix: bitmask.i -      environment: production -      ip_address: "199.119.112.150" -      services:  -        - static -      ssh_port: 22 -    donkey:  -      domain_full_suffix: unstable.bitmask.net -      domain_internal: donkey.unstable.bitmask.i -      domain_internal_suffix: unstable.bitmask.i -      environment: unstable -      ip_address: "199.119.112.207" -      services:  -        - monitor -        - pixelated -        - webapp -      ssh_port: 22 -    dotterel:  -      domain_full_suffix: dev.bitmask.net -      domain_internal: dotterel.dev.bitmask.i -      domain_internal_suffix: dev.bitmask.i -      environment: development -      ip_address: "37.218.240.50" -      services:  -        - tor -      ssh_port: 22 -    elephant:  -      domain_full_suffix: dev.bitmask.net -      domain_internal: elephant.dev.bitmask.i -      domain_internal_suffix: dev.bitmask.i -      environment: development -      ip_address: "37.218.242.214" -      services:  -        - webapp -      ssh_port: 4422 -    giraffe:  -      domain_full_suffix: cdev.bitmask.net -      domain_internal: giraffe.cdev.bitmask.i -      domain_internal_suffix: cdev.bitmask.i -      environment: clientdev -      ip_address: "37.218.242.191" -      services:  -        - couchdb -        - soledad -      ssh_port: 22 -    leech:  -      domain_full_suffix: demo.bitmask.net -      domain_internal: leech.demo.bitmask.i -      domain_internal_suffix: demo.bitmask.i -      environment: demo -      ip_address: "198.252.153.85" -      services:  -        - webapp -      ssh_port: 4422 -    lynx:  -      domain_full_suffix: cdev.bitmask.net -      domain_internal: lynx.cdev.bitmask.i -      domain_internal_suffix: cdev.bitmask.i -      environment: clientdev -      ip_address: "37.218.242.146" -      services:  -        - mx -        - webapp -      ssh_port: 22 -    millipede:  -      domain_full_suffix: demo.bitmask.net -      domain_internal: millipede.demo.bitmask.i -      domain_internal_suffix: demo.bitmask.i -      environment: demo -      ip_address: "198.252.153.83" -      openvpn_gateway_address: "198.252.153.84" -      services:  -        - openvpn -      ssh_port: 4422 -    newt:  -      domain_full_suffix: dev.bitmask.net -      domain_internal: newt.dev.bitmask.i -      domain_internal_suffix: dev.bitmask.i -      environment: development -      ip_address: "37.218.242.145" -      services:  -        - backup -      ssh_port: 22 -    orangutan:  -      domain_full_suffix: singlenode.bitmask.net -      domain_internal: orangutan.singlenode.bitmask.i -      domain_internal_suffix: singlenode.bitmask.i -      environment: singlenode -      ip_address: "37.218.247.46" -      services:  -        - couchdb -        - monitor -        - mx -        - soledad -        - webapp -      ssh_port: 22 -    otter:  -      domain_full_suffix: demo.bitmask.net -      domain_internal: otter.demo.bitmask.i -      domain_internal_suffix: demo.bitmask.i -      environment: demo -      ip_address: "46.165.242.166" -      openvpn_gateway_address: "46.165.242.169" -      services:  -        - openvpn -        - tor -      ssh_port: 4422 -    snail:  -      domain_full_suffix: dev.bitmask.net -      domain_internal: snail.dev.bitmask.i -      domain_internal_suffix: dev.bitmask.i -      environment: development -      ip_address: "37.218.242.215" -      openvpn_gateway_address: "37.218.242.216" -      services:  -        - mx -        - openvpn -      ssh_port: 4422 -    tuatara:  -      domain_full_suffix: unstable.bitmask.net -      domain_internal: tuatara.unstable.bitmask.i -      domain_internal_suffix: unstable.bitmask.i -      environment: unstable -      ip_address: "199.119.112.208" -      openvpn_gateway_address: "199.119.112.141" -      services:  -        - openvpn -      ssh_port: 22 -  nagiosadmin_pw: NKcSQJHWBZehHLVf4ttu7HqbJPBUjNgZ  name: orangutan  nickserver:     couchdb_nickserver_user:  @@ -595,7 +232,6 @@ rbls:  service_type: user_service  services:     - couchdb -  - monitor    - mx    - soledad    - webapp @@ -677,16 +313,6 @@ ssh:        type: ssh-rsa    config:       AllowTcpForwarding: "no" -  monitor:  -    private_key: | -        -----BEGIN EC PRIVATE KEY----- -        MIHcAgEBBEIB8oVl77M1F7vixWTiW3WkRD3wdxh+sNqwnOtvRkM8PLBtBhYh5i5o -        v65G3NivSKt/x4qeG2K9is5f2WogrCNUJjOgBwYFK4EEACOhgYkDgYYABAFqCXla -        YmqZqbefpMBaMPqzjhYNaxejlOX/x8YCXsDN2HMfeb/E/FYfpEPCuLVJ5Z0aDkp7 -        6JL9i1CX/9Rcbq4DEQEc6vkEv79MOI2jfUCVVeWRcybvRK0YAT9eQK59+FgNDbEo -        2NCUWBRvKd+8TjzZ7GtCLDnGd6+gkr6orkiA3uus/A== -        -----END EC PRIVATE KEY----- -    username: monitor    mosh:       enabled: true      ports: "60000:61000" diff --git a/nodes/orangutan.json b/nodes/orangutan.json index a7a7fc5..ed9cae1 100644 --- a/nodes/orangutan.json +++ b/nodes/orangutan.json @@ -4,8 +4,7 @@      "couchdb",      "soledad",      "webapp", -    "mx", -    "monitor" +    "mx"    ],    "ip_address": "37.218.247.46",    "sources": {  | 
