From 05eaeeb68fd60051ed1ab4d4299d0efe940e4f2b Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 9 May 2017 20:53:43 +0200 Subject: Re-Add orantutan --- files/nodes/orangutan/orangutan.crt | 66 ++++---- files/nodes/orangutan/orangutan.key | 98 ++++++------ files/nodes/orangutan/orangutan_ssh.pub | 2 +- files/ssh/known_hosts | 2 +- hiera/alpaca.yaml | 3 +- hiera/cat.yaml | 2 +- hiera/donkey.yaml | 5 +- hiera/elephant.yaml | 1 + hiera/leech.yaml | 1 + hiera/lynx.yaml | 3 +- hiera/orangutan.yaml | 266 +++++++++++++++++--------------- hiera/snail.yaml | 2 +- nodes/orangutan.json | 11 +- provider.singlenode.json | 3 - secrets.json | 55 +++++-- 15 files changed, 279 insertions(+), 241 deletions(-) diff --git a/files/nodes/orangutan/orangutan.crt b/files/nodes/orangutan/orangutan.crt index c14d087..913339e 100644 --- a/files/nodes/orangutan/orangutan.crt +++ b/files/nodes/orangutan/orangutan.crt @@ -1,35 +1,35 @@ -----BEGIN CERTIFICATE----- -MIIGJjCCBA6gAwIBAgIQJFIXo3WidRaHoFv/CByfKjANBgkqhkiG9w0BAQsFADBK -MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa -BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTcwMjIzMDAwMDAwWhcNMTgw -MjIzMDAwMDAwWjArMSkwJwYDVQQDDCBvcmFuZ3V0YW4uc2luZ2xlbm9kZS5iaXRt -YXNrLm5ldDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMBWum7M/5sp -zLAdWfFGCwf1E9I88oBrzesNncypvG2L+EU3Xg1lzyhPzrVwaCmLSgk7wgqfZrW6 -sXIJsdeEj6kOiWsZBwc0hiW/FR4Ws9Qq16paJB1IbOeBI8g1q4ddK45IqWdC97zJ -cylWxR6oAA1RElv2iLxNN1gmuK6tZ2a6lQ+OG4xR9TNoQsMIgwerAs9Xk+kxCg9i -5AInxSc+6sPZ4JhsxVJcl+cJPYv+R1kLbnsoqrBia1uqJWp6lQe7n7JKI5AuihZV -Abr6ndBXdOipf949tR8HiC5LxmIfc4D0gGmx0X2G4GioYnCRGYNBM4Hhg3Yz3C2z -vy6WXDR/MqsSbAnSLmiLrqdB+KmxW0P32cPnfHwBVZ48cyr5J7PdQr+mpCDcuXDV -rJ87ezKdv331PXF9SmNuwW4Uu2LK5gzubaeb4mov4R1S7ls1LoG2xyf4caBamB5V -gFBz6prUbp/cAGrb4krL1yKWuZxj2jvtFpQ9zWRnBYTz3dxvvESq5KlhqjkJsb+R -9Qk1rqOz33i5XaEkUDwp2SJmPy6+6mtDJxJ5FtCzza/jJcQytHS7O3NmtSjXYuXd -HPcjcYn6VeZUhnAHSE6V0IeDs0FuKsNV5jx0v+T/YYx7sVcuO2USXwUG+KRBE33F -xwTKZlkJ/jRP7GcXHK5ft+1UEm90X/0hAgMBAAGjggElMIIBITAdBgNVHQ4EFgQU -J7v4YXhNYtObDyvfu6PVmjDGsaUwgacGA1UdEQSBnzCBnIIaYXBpLnNpbmdsZW5v -ZGUuYml0bWFzay5uZXSCHm5pY2tueW0uc2luZ2xlbm9kZS5iaXRtYXNrLm5ldIIe -b3Jhbmd1dGFuLnNpbmdsZW5vZGUuYml0bWFzay5pgiBvcmFuZ3V0YW4uc2luZ2xl -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 -----END CERTIFICATE----- diff --git a/files/nodes/orangutan/orangutan.key b/files/nodes/orangutan/orangutan.key index 2142de3..e3990cd 100644 --- a/files/nodes/orangutan/orangutan.key +++ b/files/nodes/orangutan/orangutan.key @@ -1,51 +1,51 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/files/nodes/orangutan/orangutan_ssh.pub b/files/nodes/orangutan/orangutan_ssh.pub index 705cd8a..ca73e77 100644 --- a/files/nodes/orangutan/orangutan_ssh.pub +++ b/files/nodes/orangutan/orangutan_ssh.pub @@ -1 +1 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6CLnQYeLzaW6dlLuyv0GFzEt6rIm0Bi0G19wKp8DpBanw5x+t+q1hnHkfJIKN/AJ6EGV10tnuM0qLUUl1LASijF+DEaygKkChHLxYmR91Em9lB/QOGIYgwtsKhBBecJJ5ZnoNOshLQs2j3qy0yCGZBnVG/v3rdtIFYYOo3/B+JSGMqos4yv0uAfv7itMtpQGqh1qy9a/2C2SyNNwssTLacf+2HHhInXdSvoMhgumRl6gpf46tqtKV4XB+8huhS4xOjQtYd4rPlZHvzgTg/uWHhSYitgT/DcQz+Z9ewzHetU+K4gvuNVs4IHRa1+8TH/8/d71FOp0T1/u+1eSNvTV/ \ No newline at end of file +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC90yKXsI4xAttXDDaV9s8ECyXV0JzCyONg+2naD92o6fdPMPL93dCqxa51rf2xO4MvFTaGLRonWF7Pze0a64X2b+FqAEanah0H7DHajN8Jlurf29LE89JieE+17HnAliejbJ9aOZGOrY0HkvrWVJRhI0l85Gg1UoBLEZLhIf88MNterBQP6JAK3TNFUPaLlNZXxlr1g6Pud/OrCpZ35NFDpez1Ju13ULpp7CULK1gvVlaCjFce4xmeKNDvzf/51IoF5XTuEu5NXWE3GNBdO/l5CDWFCdY2tj8iKQzY7ACJVIZgSDQykGBXNVv1mnh4cgX/9WJ+W1VjL+whUa5Eobb/ \ No newline at end of file diff --git a/files/ssh/known_hosts b/files/ssh/known_hosts index cf1e3df..755d38f 100644 --- a/files/ssh/known_hosts +++ b/files/ssh/known_hosts @@ -17,7 +17,7 @@ leech,leech.demo.bitmask.i,leech.demo.bitmask.net,198.252.153.85 ssh-rsa AAAAB3N 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= newt,newt.dev.bitmask.i,newt.dev.bitmask.net,37.218.242.145 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwEsXoJcsOryYgjdtF6ZwJ6iecjvG/TVyOTcfdYJCPzZXA3Pj6CPmq0R1HrfnQLq3orgQG+uxAFdkJw3jFTJVYI47MWigfFum10Mu8/URGANd50Ahn0NxRBAqgjSBog5r9xEDPc1OLur91VHCV95sKK+Qfh18h9MGdyB2ypN4puON1JXLkxdUmlOt80vs5tX6mLTik9JzV6QQrJN0I2GZfVWg46y0jPQehl3OS+3z8Z4RBKXUaxQPoHx/G+VukUL76hQUMlqEzH2pF9nrkkM1uHDOftBBeiWZo3X/89ljsrDrP9wurQ+/bzEUiEbg3ZW1ZIe/T3FFrAUi2r3giyEEf -orangutan,orangutan.singlenode.bitmask.i,orangutan.singlenode.bitmask.net,37.218.247.46 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6CLnQYeLzaW6dlLuyv0GFzEt6rIm0Bi0G19wKp8DpBanw5x+t+q1hnHkfJIKN/AJ6EGV10tnuM0qLUUl1LASijF+DEaygKkChHLxYmR91Em9lB/QOGIYgwtsKhBBecJJ5ZnoNOshLQs2j3qy0yCGZBnVG/v3rdtIFYYOo3/B+JSGMqos4yv0uAfv7itMtpQGqh1qy9a/2C2SyNNwssTLacf+2HHhInXdSvoMhgumRl6gpf46tqtKV4XB+8huhS4xOjQtYd4rPlZHvzgTg/uWHhSYitgT/DcQz+Z9ewzHetU+K4gvuNVs4IHRa1+8TH/8/d71FOp0T1/u+1eSNvTV/ +orangutan,orangutan.singlenode.bitmask.i,orangutan.singlenode.bitmask.net,37.218.240.146 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC90yKXsI4xAttXDDaV9s8ECyXV0JzCyONg+2naD92o6fdPMPL93dCqxa51rf2xO4MvFTaGLRonWF7Pze0a64X2b+FqAEanah0H7DHajN8Jlurf29LE89JieE+17HnAliejbJ9aOZGOrY0HkvrWVJRhI0l85Gg1UoBLEZLhIf88MNterBQP6JAK3TNFUPaLlNZXxlr1g6Pud/OrCpZ35NFDpez1Ju13ULpp7CULK1gvVlaCjFce4xmeKNDvzf/51IoF5XTuEu5NXWE3GNBdO/l5CDWFCdY2tj8iKQzY7ACJVIZgSDQykGBXNVv1mnh4cgX/9WJ+W1VjL+whUa5Eobb/ 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 diff --git a/hiera/alpaca.yaml b/hiera/alpaca.yaml index 4579809..ce5ba12 100644 --- a/hiera/alpaca.yaml +++ b/hiera/alpaca.yaml @@ -214,6 +214,7 @@ mynetworks: - "199.119.112.208" - "199.119.112.223" - "204.13.164.171" + - "37.218.240.146" - "37.218.240.50" - "37.218.242.145" - "37.218.242.146" @@ -221,7 +222,6 @@ mynetworks: - "37.218.242.213" - "37.218.242.214" - "37.218.242.215" - - "37.218.247.46" - "46.165.242.166" name: alpaca nickserver: @@ -438,6 +438,7 @@ webapp: nagios_test_user: password: znHfAeMKkJrxawAxR8qCSXT4ZRKcDmv4 username: nagios_test + secret_key_base: DZadZDzrRgbhuHVMFeFLBce9B3H52mYF secret_token: NzzrnxL4EXUUvNhDhteMzAZCkBqphgSC secure: false service_levels: diff --git a/hiera/cat.yaml b/hiera/cat.yaml index 5cccd41..56c0505 100644 --- a/hiera/cat.yaml +++ b/hiera/cat.yaml @@ -82,6 +82,7 @@ mynetworks: - "199.119.112.208" - "199.119.112.223" - "204.13.164.171" + - "37.218.240.146" - "37.218.240.50" - "37.218.242.145" - "37.218.242.146" @@ -89,7 +90,6 @@ 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 c83e738..7685bb3 100644 --- a/hiera/donkey.yaml +++ b/hiera/donkey.yaml @@ -295,7 +295,7 @@ hosts: 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" + ip_address: "37.218.240.146" port: 22 otter: domain_full: otter.demo.bitmask.net @@ -509,7 +509,7 @@ nagios: domain_internal: orangutan.singlenode.bitmask.i domain_internal_suffix: singlenode.bitmask.i environment: singlenode - ip_address: "37.218.247.46" + ip_address: "37.218.240.146" services: - couchdb - mx @@ -770,6 +770,7 @@ webapp: nagios_test_user: password: SvVjM5NCe2RF6XwTtZ7dGxAZ7E7KeSNS username: nagios_test + secret_key_base: UYpvMtmWJ3ZAbEbESNqJsZcTjrJKmM9h secret_token: aC9zAs6X5YE_9EC_RQckGCFkKfJ4vTAJ secure: false service_levels: diff --git a/hiera/elephant.yaml b/hiera/elephant.yaml index e6046f1..b43dc58 100644 --- a/hiera/elephant.yaml +++ b/hiera/elephant.yaml @@ -388,6 +388,7 @@ webapp: nagios_test_user: password: zvzLB64_Z_5ZL5xvI5MfpUCP3b7gKzhP username: nagios_test + secret_key_base: tJJRRyunKhskkdMP3MIJI4JBf5uByCs7 secret_token: _DLZ7e9YhU_d3HDCWFzCMd3WnC4QaP__ secure: false service_levels: diff --git a/hiera/leech.yaml b/hiera/leech.yaml index 3498784..8de83bf 100644 --- a/hiera/leech.yaml +++ b/hiera/leech.yaml @@ -390,6 +390,7 @@ webapp: nagios_test_user: password: asDCV5RKzagaU2SHjXV8FtMbSwbYWxDe username: nagios_test + secret_key_base: qsBHRsyny8jNv7j4Kq8cEQP75H85H4Dk secret_token: EIzVM3Y5K4bzeKRf75ebeR7q9ndRKWVD secure: true service_levels: diff --git a/hiera/lynx.yaml b/hiera/lynx.yaml index 694f068..1b52831 100644 --- a/hiera/lynx.yaml +++ b/hiera/lynx.yaml @@ -187,6 +187,7 @@ mynetworks: - "199.119.112.208" - "199.119.112.223" - "204.13.164.171" + - "37.218.240.146" - "37.218.240.50" - "37.218.242.145" - "37.218.242.146" @@ -194,7 +195,6 @@ mynetworks: - "37.218.242.213" - "37.218.242.214" - "37.218.242.215" - - "37.218.247.46" - "46.165.242.166" name: lynx nickserver: @@ -404,6 +404,7 @@ webapp: nagios_test_user: password: HpR8dKsLPnYXjQaHXfC3rP_dM3CpXKIL username: nagios_test + secret_key_base: KKTTExcvRPZByNyXJEpCjAKg3asHD9XI secret_token: MwScfJR7TbrkhSbsYIkMLuac55J48rnt secure: false service_levels: diff --git a/hiera/orangutan.yaml b/hiera/orangutan.yaml index 8946862..5d4f021 100644 --- a/hiera/orangutan.yaml +++ b/hiera/orangutan.yaml @@ -14,34 +14,34 @@ couch: port: 5984 users: admin: - password: jgU3EHDw4zsz4sV2cCEEpxzyNqF5K7wn - salt: b0ffebcc5fbfd4c7bb757912e143a642 + password: MhLY9UXRZEqgIJpXAWUBMumHWVkJnzqr + salt: 5e537b497ce8696b6b7b5e648e7e8a99 username: admin leap_mx: - password: dJvVzZACdssXbDPgmUwurZYwcUByMIyq - salt: 7af30167817f2e9494021851323a6b6b + password: 5qnaYMATVHAXfjuaHZzkcL2ybP8hW9Uy + salt: 4c9de0ec8939faff9c2809ac7f689075 username: leap_mx nickserver: - password: vABKqhBvAnzEvI3CRnyqAZJHEuJt4dUP - salt: 3b521c4c7070b5cf19ad3056027985cb + password: whaYQz9DZ9WBLnLdkb2XybDcm4mMWZnV + salt: 97d3b0e8d94f5bef5e1cf349beb0aa68 username: nickserver replication: - password: Mb947ekU9gB8qJcTAmkzgPrMrQAdywDN - salt: 249b5496e3c9a63f8198bebf722e3148 + password: ZLdJETSRackTXrUIrYCSp8YgyT55TmXN + salt: 340a0bd97e37b4561d2989eb87fd2aa4 username: replication soledad: - password: KJFxxAPzVMWyPWKNLSnvu7dTwpTwaqsv - salt: 46b4911f1f4cff996a19a19424cd4730 + password: cykq8F4vShwQFnwkVE3cAcvqkKYXmSkD + salt: 97817b217eb4392b6ddc231b31f64cea username: soledad webapp: - password: SgmHyQyLISHbRCzHzMURHEgUmSCnQpAw - salt: 2e13b660747c5d3f41bc6f604e8c2273 + password: bEs3pdQKEUXRkWx9YdgNpWRjAFvEDa8Z + salt: 799af048a7a4917b38583b3a128282c1 username: webapp webapp: - nagios_test_pw: SascIcqVQNMpsrdcJQmqceRwPBPFpXAM + nagios_test_pw: TgbWEEfKPVKxjvpgYBcBrncnWRMsVVdu couchdb_leap_mx_user: - password: dJvVzZACdssXbDPgmUwurZYwcUByMIyq - salt: 7af30167817f2e9494021851323a6b6b + password: 5qnaYMATVHAXfjuaHZzkcL2ybP8hW9Uy + salt: 4c9de0ec8939faff9c2809ac7f689075 username: leap_mx couchdb_port: 5984 definition_files: @@ -98,12 +98,18 @@ definition_files: "hosts": { "orangutan": { "hostname": "orangutan.singlenode.bitmask.net", - "ip_address": "37.218.247.46", + "ip_address": "37.218.240.146", + "location": "hong_kong", "port": 465 } }, "locations": { - + "hong_kong": { + "country_code": "HK", + "hemisphere": "N", + "name": "Hong Kong", + "timezone": "+8" + } }, "serial": 1, "version": 1 @@ -113,12 +119,18 @@ definition_files: "hosts": { "orangutan": { "hostname": "orangutan.singlenode.bitmask.net", - "ip_address": "37.218.247.46", + "ip_address": "37.218.240.146", + "location": "hong_kong", "port": 2323 } }, "locations": { - + "hong_kong": { + "country_code": "HK", + "hemisphere": "N", + "name": "Hong Kong", + "timezone": "+8" + } }, "serial": 1, "version": 1 @@ -146,15 +158,15 @@ firewall: port: - 25 - 465 - to: "37.218.247.46" + to: "37.218.240.146" soledad: from: "*" port: 2323 - to: "37.218.247.46" + to: "37.218.240.146" ssh: from: sysadmin port: 22 - to: "37.218.247.46" + to: "37.218.240.146" stunnel: [] webapp: from: "*" @@ -163,7 +175,7 @@ firewall: - 4430 - 6425 - 80 - to: "37.218.247.46" + to: "37.218.240.146" hosts: orangutan: aliases: @@ -172,11 +184,15 @@ hosts: - 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" + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC90yKXsI4xAttXDDaV9s8ECyXV0JzCyONg+2naD92o6fdPMPL93dCqxa51rf2xO4MvFTaGLRonWF7Pze0a64X2b+FqAEanah0H7DHajN8Jlurf29LE89JieE+17HnAliejbJ9aOZGOrY0HkvrWVJRhI0l85Gg1UoBLEZLhIf88MNterBQP6JAK3TNFUPaLlNZXxlr1g6Pud/OrCpZ35NFDpez1Ju13ULpp7CULK1gvVlaCjFce4xmeKNDvzf/51IoF5XTuEu5NXWE3GNBdO/l5CDWFCdY2tj8iKQzY7ACJVIZgSDQykGBXNVv1mnh4cgX/9WJ+W1VjL+whUa5Eobb/" + ip_address: "37.218.240.146" port: 22 -ip_address: "37.218.247.46" -location: ~ +ip_address: "37.218.240.146" +location: + country_code: HK + hemisphere: "N" + name: "Hong Kong" + timezone: "+8" mail: smarthost: [] mx: @@ -198,6 +214,7 @@ mynetworks: - "199.119.112.208" - "199.119.112.223" - "204.13.164.171" + - "37.218.240.146" - "37.218.240.50" - "37.218.242.145" - "37.218.242.146" @@ -205,13 +222,12 @@ mynetworks: - "37.218.242.213" - "37.218.242.214" - "37.218.242.215" - - "37.218.247.46" - "46.165.242.166" name: orangutan nickserver: couchdb_nickserver_user: - password: vABKqhBvAnzEvI3CRnyqAZJHEuJt4dUP - salt: 3b521c4c7070b5cf19ad3056027985cb + password: whaYQz9DZ9WBLnLdkb2XybDcm4mMWZnV + salt: 97d3b0e8d94f5bef5e1cf349beb0aa68 username: nickserver domain: nicknym.singlenode.bitmask.net port: 6425 @@ -230,8 +246,8 @@ soledad: couchdb_leap_mx_user: username: leap_mx couchdb_soledad_user: - password: KJFxxAPzVMWyPWKNLSnvu7dTwpTwaqsv - salt: 46b4911f1f4cff996a19a19424cd4730 + password: cykq8F4vShwQFnwkVE3cAcvqkKYXmSkD + salt: 97817b217eb4392b6ddc231b31f64cea username: soledad port: 2323 sources: @@ -249,7 +265,7 @@ sources: type: git platform: apt: - basic: "http://deb.leap.se/experimental-platform" + basic: "http://deb.leap.se/platform" component: snapshots soledad: package: soledad-server @@ -320,12 +336,13 @@ stunnel: accept_port: 15984 connect_port: 5984 tags: + - hongkong - singlenode testing: api_hosts: - orangutan.singlenode.bitmask.net api_uri: "https://api.singlenode.bitmask.net:4430/1" - monitor_auth_token: sjWsttrjheJddmxLSRNMqsF42qmgaNte + monitor_auth_token: B5H7F4taKMIcT7LkFQWmETKYDrdFI5TK webapp: admins: - azul @@ -343,8 +360,8 @@ webapp: allow_unlimited_certs: true api_tokens: allowed_ips: - - "37.218.247.46" - monitor: sjWsttrjheJddmxLSRNMqsF42qmgaNte + - "37.218.240.146" + monitor: B5H7F4taKMIcT7LkFQWmETKYDrdFI5TK api_version: 1 client_certificates: bit_size: 2048 @@ -356,13 +373,13 @@ webapp: max: ~ min: "0.9.4" couchdb_admin_user: - password: jgU3EHDw4zsz4sV2cCEEpxzyNqF5K7wn - salt: b0ffebcc5fbfd4c7bb757912e143a642 + password: MhLY9UXRZEqgIJpXAWUBMumHWVkJnzqr + salt: 5e537b497ce8696b6b7b5e648e7e8a99 username: admin couchdb_port: 5984 couchdb_webapp_user: - password: SgmHyQyLISHbRCzHzMURHEgUmSCnQpAw - salt: 2e13b660747c5d3f41bc6f604e8c2273 + password: bEs3pdQKEUXRkWx9YdgNpWRjAFvEDa8Z + salt: 799af048a7a4917b38583b3a128282c1 username: webapp customization_dir: /srv/leap/files/webapp/ default_locale: en @@ -419,9 +436,10 @@ webapp: - help - user nagios_test_user: - password: SascIcqVQNMpsrdcJQmqceRwPBPFpXAM + password: TgbWEEfKPVKxjvpgYBcBrncnWRMsVVdu username: nagios_test - secret_token: Dzf5TXc9KYAMaEtbK342mnA5QPNSvmES + secret_key_base: S89EHYTZ8QM4TcebThRRj3fNcKFSHwxF + secret_token: mIhaakjVKyprcazTDX8TIdXg8YZMMSQF secure: false service_levels: 1: @@ -465,39 +483,39 @@ x509: -----END CERTIFICATE----- cert: | -----BEGIN CERTIFICATE----- - MIIGJjCCBA6gAwIBAgIQJFIXo3WidRaHoFv/CByfKjANBgkqhkiG9w0BAQsFADBK - MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa - BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTcwMjIzMDAwMDAwWhcNMTgw - MjIzMDAwMDAwWjArMSkwJwYDVQQDDCBvcmFuZ3V0YW4uc2luZ2xlbm9kZS5iaXRt - YXNrLm5ldDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMBWum7M/5sp - zLAdWfFGCwf1E9I88oBrzesNncypvG2L+EU3Xg1lzyhPzrVwaCmLSgk7wgqfZrW6 - sXIJsdeEj6kOiWsZBwc0hiW/FR4Ws9Qq16paJB1IbOeBI8g1q4ddK45IqWdC97zJ - cylWxR6oAA1RElv2iLxNN1gmuK6tZ2a6lQ+OG4xR9TNoQsMIgwerAs9Xk+kxCg9i - 5AInxSc+6sPZ4JhsxVJcl+cJPYv+R1kLbnsoqrBia1uqJWp6lQe7n7JKI5AuihZV - Abr6ndBXdOipf949tR8HiC5LxmIfc4D0gGmx0X2G4GioYnCRGYNBM4Hhg3Yz3C2z - vy6WXDR/MqsSbAnSLmiLrqdB+KmxW0P32cPnfHwBVZ48cyr5J7PdQr+mpCDcuXDV - rJ87ezKdv331PXF9SmNuwW4Uu2LK5gzubaeb4mov4R1S7ls1LoG2xyf4caBamB5V - gFBz6prUbp/cAGrb4krL1yKWuZxj2jvtFpQ9zWRnBYTz3dxvvESq5KlhqjkJsb+R - 9Qk1rqOz33i5XaEkUDwp2SJmPy6+6mtDJxJ5FtCzza/jJcQytHS7O3NmtSjXYuXd - HPcjcYn6VeZUhnAHSE6V0IeDs0FuKsNV5jx0v+T/YYx7sVcuO2USXwUG+KRBE33F - xwTKZlkJ/jRP7GcXHK5ft+1UEm90X/0hAgMBAAGjggElMIIBITAdBgNVHQ4EFgQU - J7v4YXhNYtObDyvfu6PVmjDGsaUwgacGA1UdEQSBnzCBnIIaYXBpLnNpbmdsZW5v - ZGUuYml0bWFzay5uZXSCHm5pY2tueW0uc2luZ2xlbm9kZS5iaXRtYXNrLm5ldIIe - b3Jhbmd1dGFuLnNpbmdsZW5vZGUuYml0bWFzay5pgiBvcmFuZ3V0YW4uc2luZ2xl - bm9kZS5iaXRtYXNrLm5ldIIWc2luZ2xlbm9kZS5iaXRtYXNrLm5ldIcEJdr3LjAL - BgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAkGA1Ud - EwQCMAAwHwYDVR0jBBgwFoAUuYGDLL2sswnYpHHvProt1JU+D48wDQYJKoZIhvcN - AQELBQADggIBADDRK28qh/qYImZTt7YutCB8qrJYekze6ZxrGBgOZC0yZnhBTBlm - 7QUJY4qhFdpjRdIDhSmrNOgyHYsIiIOjOrt0950OgzaqRi47nRcy17JzQ5vomUyG - UkJ42g2cKbtjttgAGUJt+6eWiclrMeWj9P6etCYFeU1EdHEUvM14O0IIYGJKhKKD - Xr4N0uTYGRCf1he7Yjz2ubI/uh7yByUTFs2KCZi3NRDgEE5DVaq0mUtCht5E+opF - vHKSNnUrOy1g18f8Nf1pKdmTCDsygIACQ/krib1mv+RnaGVoX06t+3jzy1yY2foI - PGF6l3QTuC1DjI5MMKMSxH/iGkk4MEJwuC1gJZ1317nFb1dceBzkik6W5SH7SoAa - 7C0rP2wE4PPmbj6oGfqo97Zlovjw+8jJEijwUyRgx24H/4VJX/8g/+3sWGXhWI0h - ZpPy2VzE4QwlUs75EVYTsJcT5s3zLFZF+ByQKwteVL3TY0lsjqD8KaPB5qR+sYrb - ndnvcuGcR+RlKfe+NjVx07Gmn7rTMdAO+1R8mJR0DzKjfu5tJ+Zut27PM7If+tq2 - /clBhRGGu/bvZUU3abs/8Ico8XI1PHHsU+6BkTaiez0Uh1Os8MOuZ0EVIV9tTMWb - VEC49oOYBxgT9p/IoSOYq2BjdNuaqold6fDcpjjsOJJNuX6ot2+0ViLh + MIIGJzCCBA+gAwIBAgIRAL734FP9d44o7nIfj0B7xQ4wDQYJKoZIhvcNAQELBQAw + SjEYMBYGA1UEAwwPQml0bWFzayBSb290IENBMRAwDgYDVQQKDAdCaXRtYXNrMRww + GgYDVQQLDBNodHRwczovL2JpdG1hc2submV0MB4XDTE3MDUwOTAwMDAwMFoXDTE4 + MDUwOTAwMDAwMFowKzEpMCcGA1UEAwwgb3Jhbmd1dGFuLnNpbmdsZW5vZGUuYml0 + bWFzay5uZXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDTDjiLBBmm + gYPG/8j10uRPaxXOYd7l1FcA7FPcWbksa6M/cIlqo/CYuINC6RhySS8ZWFc6lCMo + zgbObybwn7vGUmvtU/oLLaRX6Mf/vLKMn3rm018NMeiAfNX34SyV7R7eRgjSDidO + D1ACytDA23tFuOPYKDmpicUGlq7jfbibUfbNMURHMN4yi5MpzWztys+cZZFzmNdw + Tw2qgZq2j+QsoDvVOsHAcr1DT2cUQWd3MFGlBqEM4WXMsuNZwg7/hNxZwbGlTkkC + A/f7AhueIz4qQifAlqQv8Zgin89Us5hAtsmrRH3lrT74JH/jhPyWtHvjPFGXFEff + 2n3kr/maZB1zVGMQCpwEBMXrETWEqeQdh6oqX9uVPXOru3qbi7KZdzziwdSRcS5A + 9EEkougWuB5NdohKXpnZ6lhYd3eYyGo1P7YT+XaB4JQIFiJGzxWbU5sqs2LNOSG3 + F8AuA5QtL3lTOAkOneqxq9VQSA6X9vmyqqqQLWKhKx70fGvloMNdKzXYGRHj9pgz + T7nces0QxYGlxWnxZw8xi2rtzF5y0LpXMbjgpjlpiV0aWQnQri9C16/PhWk8FerW + tuMKK3Knif/M3avM54T2uh30Jj35wuXNOtApa71sKzK4zAqKNU7h5oH2sVJD58Dc + 44LUSIixS51uacNI/64dG3ohskZyJBd/VQIDAQABo4IBJTCCASEwHQYDVR0OBBYE + FOL1XIHDLRZJ/vykjHjJ3jRzxcuPMIGnBgNVHREEgZ8wgZyCGmFwaS5zaW5nbGVu + b2RlLmJpdG1hc2submV0gh5uaWNrbnltLnNpbmdsZW5vZGUuYml0bWFzay5uZXSC + Hm9yYW5ndXRhbi5zaW5nbGVub2RlLmJpdG1hc2suaYIgb3Jhbmd1dGFuLnNpbmds + ZW5vZGUuYml0bWFzay5uZXSCFnNpbmdsZW5vZGUuYml0bWFzay5uZXSHBCXa8JIw + CwYDVR0PBAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAJBgNV + HRMEAjAAMB8GA1UdIwQYMBaAFLmBgyy9rLMJ2KRx7z66LdSVPg+PMA0GCSqGSIb3 + DQEBCwUAA4ICAQCROrpnCzabe5gGo2717XulJ74NyouTfxxIc/Iio14CBePpzkmz + yExZ5e9jl7BHJDbbnuhdzMOSp5NUfttT6dECYP4wX0lljlCWvGHh8limGL7Xy7CI + 2ZOLZF/KBWZpFz2HqAGi2p9XvvcWZZJn40NdTOMbEW6LhCUoI5K8m9LIDEnuOd3Q + B5RLjzSxPRl+1gSvc1chspsc9YvJ+9PKPGpeErmufeF9Hklqr45WItuzdcLjfzep + OLC4vHHbc3aJ4AoSLHxoOc0ItYJ0gTkTDxFEAw7hE1whESo3thB0+zA0HeCGWDUS + rT7ANRYf79crxVqiqpw2E9HNiR9bTcgiR3CEKWoVVvGTXhSmC+q9SZq7YECxgamp + uOvxNGj80moMUlbyXvhtb0xj7YYArsZ2QI1Rft30ytnNHzLJdxMQS3WcKqGvI/w0 + UR6koopuF6Jul+HaTxbRkH2w+65hrmayi+CL0+2KO1VeHfugx7i5xvg5EXssVq5l + jCuc0VwC6Y6ro8WfLUzvnWCl+vot9KDr38EtEaHz7I6m+TSNWEsfc9v0vxk8doLY + TCxmTS/ZzUYqX/CVOoZWuHWbmT3MY2Xgvt8aj2YtIgS6uqc0Ch70Z7njx1k6Zn2v + B3bdZ5lEDZ1g+ExYviXO5UunCfu+2AZMgBJEKDeFXQRHzQYK1s6lweUIDw== -----END CERTIFICATE----- client_ca_cert: | -----BEGIN CERTIFICATE----- @@ -673,55 +691,55 @@ x509: -----END RSA PRIVATE KEY----- key: | -----BEGIN RSA PRIVATE KEY----- - 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 -----END RSA PRIVATE KEY----- use: true use_commercial: true diff --git a/hiera/snail.yaml b/hiera/snail.yaml index 8d29829..fd4e5c1 100644 --- a/hiera/snail.yaml +++ b/hiera/snail.yaml @@ -89,6 +89,7 @@ mynetworks: - "199.119.112.208" - "199.119.112.223" - "204.13.164.171" + - "37.218.240.146" - "37.218.240.50" - "37.218.242.145" - "37.218.242.146" @@ -96,7 +97,6 @@ mynetworks: - "37.218.242.213" - "37.218.242.214" - "37.218.242.215" - - "37.218.247.46" - "46.165.242.166" name: snail obfsproxy: diff --git a/nodes/orangutan.json b/nodes/orangutan.json index ed9cae1..6a65a45 100644 --- a/nodes/orangutan.json +++ b/nodes/orangutan.json @@ -1,17 +1,10 @@ { - "tags": ["singlenode"], + "tags": ["singlenode", "hongkong"], "services": [ "couchdb", "soledad", "webapp", "mx" ], - "ip_address": "37.218.247.46", - "sources": { - "platform": { - "apt": { - "basic": "http://deb.leap.se/experimental-platform" - } - } - } + "ip_address": "37.218.240.146" } diff --git a/provider.singlenode.json b/provider.singlenode.json index 0548fe7..dace903 100644 --- a/provider.singlenode.json +++ b/provider.singlenode.json @@ -2,8 +2,5 @@ "domain": "singlenode.bitmask.net", "service": { "allow_anonymous": false - }, - "platform": { - "branch": "8144_remove_haproxy" } } diff --git a/secrets.json b/secrets.json index 4ffbc14..980188d 100644 --- a/secrets.json +++ b/secrets.json @@ -14,6 +14,7 @@ "couch_webapp_password": "_CatyL3Ienc4wRrfPubrhyfYCFmCyt9t", "couch_webapp_password_salt": "1c1dd6eb78f027414f1638bd6c902a5a", "nagios_test_password": "HpR8dKsLPnYXjQaHXfC3rP_dM3CpXKIL", + "webapp_secret_key_base": "KKTTExcvRPZByNyXJEpCjAKg3asHD9XI", "webapp_secret_token": "MwScfJR7TbrkhSbsYIkMLuac55J48rnt" }, "demomail": { @@ -31,6 +32,7 @@ "couch_webapp_password": "xZZjnvmuRTVFPUg4jYQDJkayBfFb2Ws4", "couch_webapp_password_salt": "f4fcbccdd0d985ca68120e4b85e7146d", "nagios_test_password": "znHfAeMKkJrxawAxR8qCSXT4ZRKcDmv4", + "webapp_secret_key_base": "DZadZDzrRgbhuHVMFeFLBce9B3H52mYF", "webapp_secret_token": "NzzrnxL4EXUUvNhDhteMzAZCkBqphgSC" }, "demovpn": { @@ -53,6 +55,7 @@ "scramblesuit_port_millipede": 19345, "scramblesuit_port_otter": 31244, "tor_family": "dVuPt9yFz8SpKmBdBFsLSL9Bz4VJu3Am", + "webapp_secret_key_base": "qsBHRsyny8jNv7j4Kq8cEQP75H85H4Dk", "webapp_secret_token": "EIzVM3Y5K4bzeKRf75ebeR7q9ndRKWVD" }, "development": { @@ -73,24 +76,45 @@ "scramblesuit_password_snail": "OZ3FOSKQKR3EUTCZPJWTEZKWMVGVCNZZ", "scramblesuit_port_snail": 27889, "tor_family": "uSaR9IekHdQGUGIRrdThPFW64_JYgEnr", + "webapp_secret_key_base": "tJJRRyunKhskkdMP3MIJI4JBf5uByCs7", "webapp_secret_token": "_DLZ7e9YhU_d3HDCWFzCMd3WnC4QaP__" }, + "local": { + "api_monitor_auth_token": "XcQ7zgwasRyDRMsqtAHqryyQhAJvkCkJ", + "couch_admin_password": "DYteahy7AsW2D5WIz4X5q3rsfReeeWxa", + "couch_admin_password_salt": "eadbc632626afd7cff088a94c3707aba", + "couch_leap_mx_password": "bxMst74hQWy5qxExcqzauKBk5pB39mH5", + "couch_leap_mx_password_salt": "4b8648301242da72c83633f97cab7891", + "couch_nickserver_password": "XEPsTAhk7fUk2qPPppXJwcRtUvFnkwBd", + "couch_nickserver_password_salt": "175f1f60caadeb6089f36a652ff0095f", + "couch_replication_password": "FDrHVZdvkRBNZEjvgUIhAJvJvaVrKvpU", + "couch_replication_password_salt": "74fb5c115eb1e2af664bf5041c6a0f7e", + "couch_soledad_password": "sLEfLMmKkKVUKa5FU3CIytsVvBm2wuMU", + "couch_soledad_password_salt": "b1f015a1559a570f5bea820e978be32b", + "couch_webapp_password": "a87UpfHPAzffPKNYUteqPmNAqNAyqF3I", + "couch_webapp_password_salt": "5bd67d150b855798f0b3400d2b6e9946", + "nagios_admin_password": "ZfcYp3B3Ur2KSMdvtndRqmbUwphnpbSf", + "nagios_test_password": "PvHF4XgdFkPHYd3vg7tdXcf8Lq7PzYPw", + "webapp_secret_key_base": "DF5qQehebmYHbb83SP4x9fvJHm8Ueb78", + "webapp_secret_token": "YFncSBPmT9We8mxHXSHcXTwf2NLj53zX" + }, "singlenode": { - "api_monitor_auth_token": "sjWsttrjheJddmxLSRNMqsF42qmgaNte", - "couch_admin_password": "jgU3EHDw4zsz4sV2cCEEpxzyNqF5K7wn", - "couch_admin_password_salt": "b0ffebcc5fbfd4c7bb757912e143a642", - "couch_leap_mx_password": "dJvVzZACdssXbDPgmUwurZYwcUByMIyq", - "couch_leap_mx_password_salt": "7af30167817f2e9494021851323a6b6b", - "couch_nickserver_password": "vABKqhBvAnzEvI3CRnyqAZJHEuJt4dUP", - "couch_nickserver_password_salt": "3b521c4c7070b5cf19ad3056027985cb", - "couch_replication_password": "Mb947ekU9gB8qJcTAmkzgPrMrQAdywDN", - "couch_replication_password_salt": "249b5496e3c9a63f8198bebf722e3148", - "couch_soledad_password": "KJFxxAPzVMWyPWKNLSnvu7dTwpTwaqsv", - "couch_soledad_password_salt": "46b4911f1f4cff996a19a19424cd4730", - "couch_webapp_password": "SgmHyQyLISHbRCzHzMURHEgUmSCnQpAw", - "couch_webapp_password_salt": "2e13b660747c5d3f41bc6f604e8c2273", - "nagios_test_password": "SascIcqVQNMpsrdcJQmqceRwPBPFpXAM", - "webapp_secret_token": "Dzf5TXc9KYAMaEtbK342mnA5QPNSvmES" + "api_monitor_auth_token": "B5H7F4taKMIcT7LkFQWmETKYDrdFI5TK", + "couch_admin_password": "MhLY9UXRZEqgIJpXAWUBMumHWVkJnzqr", + "couch_admin_password_salt": "5e537b497ce8696b6b7b5e648e7e8a99", + "couch_leap_mx_password": "5qnaYMATVHAXfjuaHZzkcL2ybP8hW9Uy", + "couch_leap_mx_password_salt": "4c9de0ec8939faff9c2809ac7f689075", + "couch_nickserver_password": "whaYQz9DZ9WBLnLdkb2XybDcm4mMWZnV", + "couch_nickserver_password_salt": "97d3b0e8d94f5bef5e1cf349beb0aa68", + "couch_replication_password": "ZLdJETSRackTXrUIrYCSp8YgyT55TmXN", + "couch_replication_password_salt": "340a0bd97e37b4561d2989eb87fd2aa4", + "couch_soledad_password": "cykq8F4vShwQFnwkVE3cAcvqkKYXmSkD", + "couch_soledad_password_salt": "97817b217eb4392b6ddc231b31f64cea", + "couch_webapp_password": "bEs3pdQKEUXRkWx9YdgNpWRjAFvEDa8Z", + "couch_webapp_password_salt": "799af048a7a4917b38583b3a128282c1", + "nagios_test_password": "TgbWEEfKPVKxjvpgYBcBrncnWRMsVVdu", + "webapp_secret_key_base": "S89EHYTZ8QM4TcebThRRj3fNcKFSHwxF", + "webapp_secret_token": "mIhaakjVKyprcazTDX8TIdXg8YZMMSQF" }, "unstable": { "api_monitor_auth_token": "AuAf4eu94UfDNLqnujJLrbLVnBxRHPeR", @@ -110,6 +134,7 @@ "nagios_test_password": "SvVjM5NCe2RF6XwTtZ7dGxAZ7E7KeSNS", "scramblesuit_password_tuatara": "JJAUC422KNVGMMRXIZIGM3LOK44XMQ2Z", "scramblesuit_port_tuatara": 21724, + "webapp_secret_key_base": "UYpvMtmWJ3ZAbEbESNqJsZcTjrJKmM9h", "webapp_secret_token": "aC9zAs6X5YE_9EC_RQckGCFkKfJ4vTAJ" } } -- cgit v1.2.3