From e5cac49bf5da68efdc7ab0ec73f41a19b3a73e5c Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 6 May 2015 12:31:19 -0400 Subject: update elk to use port 4422 for ssh, like the others; re-deploy the dev machines, so their ssh keys changed --- files/nodes/clam/clam_ssh.pub | 2 +- files/nodes/elephant/elephant_ssh.pub | 2 +- files/nodes/elk/elk_ssh.pub | 2 +- files/nodes/snail/snail_ssh.pub | 2 +- files/nodes/starfish/starfish_ssh.pub | 2 +- files/nodes/urchin/urchin_ssh.pub | 2 +- files/ssh/known_hosts | 12 +++---- hiera/ant.yaml | 29 ++--------------- hiera/armadillo.yaml | 28 +--------------- hiera/chameleon.yaml | 61 ++++++++++------------------------- hiera/chipmonk.yaml | 2 +- hiera/clam.yaml | 41 +++++------------------ hiera/couch1.yaml | 29 ++--------------- hiera/couch2.yaml | 29 ++--------------- hiera/deer.yaml | 29 ++--------------- hiera/demodex.yaml | 29 ++--------------- hiera/elephant.yaml | 54 ++++++++----------------------- hiera/elk.yaml | 57 +++++++++++--------------------- hiera/frog.yaml | 31 ++---------------- hiera/gorilla.yaml | 28 +--------------- hiera/hippo.yaml | 27 +--------------- hiera/koala.yaml | 29 ++--------------- hiera/ladybug.yaml | 29 ++--------------- hiera/leech.yaml | 31 ++---------------- hiera/millipede.yaml | 29 ++--------------- hiera/monitor1.yaml | 29 ++--------------- hiera/mx1.yaml | 31 ++---------------- hiera/octopus.yaml | 31 ++---------------- hiera/otter.yaml | 29 ++--------------- hiera/panda.yaml | 29 ++--------------- hiera/plain1.yaml | 29 ++--------------- hiera/seahorse.yaml | 29 ++--------------- hiera/snail.yaml | 29 ++--------------- hiera/starfish.yaml | 47 +++++++-------------------- hiera/thrips.yaml | 29 ++--------------- hiera/tor1.yaml | 29 ++--------------- hiera/urchin.yaml | 41 +++++------------------ hiera/vpn1.yaml | 29 ++--------------- hiera/wallaby.yaml | 40 ++++------------------- hiera/web1.yaml | 40 ++++------------------- nodes/elk.json | 5 ++- 41 files changed, 156 insertions(+), 956 deletions(-) diff --git a/files/nodes/clam/clam_ssh.pub b/files/nodes/clam/clam_ssh.pub index f67678f..14eb8b7 100644 --- a/files/nodes/clam/clam_ssh.pub +++ b/files/nodes/clam/clam_ssh.pub @@ -1 +1 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCajNm7/fQTZGrPHlAQvViRyJNw0VUYfY8O7BAQxEPsBkyShRoSLm/naDn62TNrj8+Qp0P9A3JJAFmHz3R26Qy2EibBVHzSPhPbNfC2tVCjT8nnvPQFdu2ZAnCG2VCdm/RmLrTXyAApkHXebD37GhTYOAaP2om3jV6KJpKnwYh4g7qPwC/o1h5O5F9HJKRV/aa32mwmxk7bttisDSru1AN/Ag2GibE7z6+HINKAhC4Ptyf0LReKShbPmrULHxfNXXlqNix280NeY/bqsWl03HAmttyRATXA+Repp92CLq24wJC5rBUw/1G8mGCz7HlmRiH72WeuA6mRZrrRoNODiAF \ No newline at end of file +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqXPBidNRThgSRlEeKFuLxnGf/kmkaHoBimkZRrN7kxhGAwYSrf5mtUGqVFWGcWMPYhqU1uGkZnCgQWV9d60OmWNIZNqsq5Rs343PGKW9S3LrnAa0yFZKLRtESCh53taxF+uJ/vcV76oai+I7b2EZOVtUP6F+iSb3/D+piAcL+p284KkKywsj9FREoh+dpMHthSb7bQDSKqq9UZJVEDQev1tjT7FHnbIY0QJLcYBtYbj945G63UYPQbHVxkl2GCaTXLKaC5CfLRH6cHvwLS3HtyCFEgo9fw0BqztN+Q50+YiQYlKmY6DEnMxwyB7/CjzBcDPa+e0qXygV2mjaHsuN9 \ No newline at end of file diff --git a/files/nodes/elephant/elephant_ssh.pub b/files/nodes/elephant/elephant_ssh.pub index b15328c..38d516b 100644 --- a/files/nodes/elephant/elephant_ssh.pub +++ b/files/nodes/elephant/elephant_ssh.pub @@ -1 +1 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCYskvUxkCVcQlJksuQJKV4S8YA3kefBHQio4X1BU2d8OJxv/GrrFsjzcsitjjmo77Y7bscOzyt/L+cCSwgfzAmtK3uwv31SgV6eQRJlXpf/HrtK5VQQVj/qe1R/R2fn4ij++sDkNfofuHqo68U1LjSZoqvTG5lExiXnN0GJKF9SwZ7t0/72Nm8DU4i6YQ+89VPU0xZdR1USyz2c++MaseizNra1vr4pxF0GmYnY4xB/UNmRvPRvPrwNCp1I3twnFE9onVWV6HUaMB4hHXqksUE4uGHlkO+LxniceyQTzqhlN1brwF92jbP+0QtsFfFdrAbdLVxxEbTvNU9WonpU+AL \ No newline at end of file +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7XlP9uTmyHhP8x3ZqKZZfAiUtrVueWm+5yYJ1hJYHv9+o3WLN3AAv8q+ISd5AHE8XyHgXUZHfYZ8kOtF4DqPAXshhXxvmoRu5bSl+H36q0wFDUkM5z97IM46/ryDaQD0JlgNkZPARlHqZbKOf8ge4uVRxgV18bw9+E8aoNkjnMnC6TZBjXmpwa1tnIrfRN0NEEBYUyN8Hz8zZ0FA6o3q6FvWq1UzCntU4lhzvFV83PzU7r1tnUr8qWiVw708oPTduK9Lvzx7jgpNJYDKlCUJscXfwL4CYtn9AzaCTS1LsbH0apr7ccGatFwZ+6SRZQ9wUCsd6vP2reM93MTyYVg7N \ No newline at end of file diff --git a/files/nodes/elk/elk_ssh.pub b/files/nodes/elk/elk_ssh.pub index 6df948d..c1440e4 100644 --- a/files/nodes/elk/elk_ssh.pub +++ b/files/nodes/elk/elk_ssh.pub @@ -1 +1 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAQhe04n0cSyx0VXXZnYiYPA1+1jOVmNV9u+sf2T0zhOrWIuX0i9+anzwtKdGaIu659Sus59EoyHYioHXfd7KPT/k0HupHu8K68J6L3pS8Jsdbpf8Ud76FcxJRqB9VbjFJ3GAO+Me7xaIFFtvwyVq2RkGdGaIhwvyq5yodJfPk33GJOxGh9J2I2Gn1xSLROWnz+ve7hrrpoysoGRbrrIMIrvHXH6ncrxKsubr7j5Pc+zQz1JY63A0bNQQSv+mZY2cLR/7vTFWurmlz58hKUfyaC6c6cHska7cuuYdEw//iQxN7v156IudZODhBn71mzfQiXi7Bsa2pfZwKFqctfbsz \ No newline at end of file +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrcf0LAT87yXYy8D6M2cnn88Cq+sHn+yCc5bApC8eDAsnEhU85AM23uPPlhvrGUlC2sWq5027693OOiUeoWuIv62J0ezggw4m8NLp8Y1zWsx9jS7y3wUHjGmZcB/abWUOLLT9ouQoZeGRqix0jaSkO1VnjRwKzPPhLYhbsxuVVy2hvAWDoV0ufaJi1N+wpqPzDrUa5SrlEyGbhnPiA+AlVU6GyCxB/DV+PiURf+W52dDeiFkOGlPgwu4vzMj1nes6wrQKTguINBw+6tTIF3C6hIqtbIRu+EVV4JFQ/UjuaZ57ubw616R3BC8IJdwSycZ3TFbEDLRpG9AkKS/OBI8OV \ No newline at end of file diff --git a/files/nodes/snail/snail_ssh.pub b/files/nodes/snail/snail_ssh.pub index cb558cd..4f8925e 100644 --- a/files/nodes/snail/snail_ssh.pub +++ b/files/nodes/snail/snail_ssh.pub @@ -1 +1 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLU8dg8lzmOOjQGfBvbUlDjyClqcxSDyCanP2Z4j8GU24a5sHTLydLIs2FM6xY/HmvZx1pBe7V/4gXVHG3Ym8P+kC/H6gybZIQpIZpjDzx5VsuZSeMk0PaEKCvMw3vbGcrKvtJWUw9aF9E5b/nDB3d/uy/EdW01wpEv8OQzqtNmoodVW9G8sxcdp+VzsowK1W7wMYcau7f1BzIxEnUnZaA0HWRiMYR0ggFfyO1P64X3KeVD4mv1xf243cqDSt2ODoZBcdp42Y/hn6ARCZUK8tpyFWvohLJOf5JNwX7I47czSd7SIFRLnncV1d5K6Egf9pFLaJPaTXC6chmv7Xvl6ut \ No newline at end of file +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGhGw8BA+EBnkf0puixL34qlzciMCnVfot3OySQp5bRlrTYkHnsbjjHjj0UmccQMHLOdo06wK8vgWWuXOL6kH/FFZ3EumoIwrt5Nfwe2kIvPtJNlgqCEGCA9fkZSffQdbkdfgH68XCPDClgKeol5lp/epuDu3FBAU7ZglQCnbljSEUDmlGfn2rc06QikmnzvetDrLllV78KwIseclx/2zb97+JAiTcPIEYxWW7LKOoHwOYXVo4mJNMMOcuaEyomhO1j3TMWOcmvEwFdwyF34dhN4Hte6Tqz4StNd7T7xezu2qZ8dCQ59S4G80zZuAfHoZxqzbR5DSq/MF7lblGpgHt \ No newline at end of file diff --git a/files/nodes/starfish/starfish_ssh.pub b/files/nodes/starfish/starfish_ssh.pub index 94faeda..86aa56d 100644 --- a/files/nodes/starfish/starfish_ssh.pub +++ b/files/nodes/starfish/starfish_ssh.pub @@ -1 +1 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQClQH3zJNBilfI6FeMR9xi3HPZPK0GD0frwJyfAtaCRaWdJAXwO/kjScrOeF+JWgaDL3Ej7nRz3lo2qeQKRhC2HawA+dDSZKbreOg5nghEFT4NY5h8brKLk0/d7+8fUofsyTRrS+gfAauqxiRcmcy8prMiAdLL8SWcb9ylExq9AvxovIJ1CPZ59PL5Hc/REFybnux1y2qdQ0IewZ4DKx16/0NLArIYxNNwRn3qp8Vy1I/2VPpwpeH8kgN+v4/9iL32TM5dLlZ4uKed/WTSKyWalN1HbAGgV5Sx9KXmPoo/0l/CqCAJzLqttACWZbutE+O6fQqYg7o7idhQ6VDE2YKe/ \ No newline at end of file +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCkbUoYD7f7Sbl+ElkJmxopRXh21DhcrVfFqlUwSdSpnAtgTSFRC1JMrDkPdJ69htsYiwoB+Bed0FQyCB4NU0QJbgM73VXJ0SqrpJJKx/7Ry5E8aBukiaAe8k8O6ZbnPeoZx11PwrSlS9Wrh928tuH7/ism7XHytlFYayYywvY2djIy9TbLsuOV6EQmVAVONhRVet4iOiFqfFDplRjttFVMJROO8W51YDdcTEwR+gLwS7yKp3e/XZT1vrHzmKo7j9saEgC0KncJrGDqoZ0Q1U0Did+MmHRQTJ13TcjHDnCiU7nO9w6OgGo4nTzGOJCjJkJm8opCxT3X0jCcHIkmEIU/ \ No newline at end of file diff --git a/files/nodes/urchin/urchin_ssh.pub b/files/nodes/urchin/urchin_ssh.pub index 91ce0c0..7604604 100644 --- a/files/nodes/urchin/urchin_ssh.pub +++ b/files/nodes/urchin/urchin_ssh.pub @@ -1 +1 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC5KHWPUGhpPTvgDCyUeg59eYHN6QEPUck37GlKeRod24M2ShqsYB9F2Awg8fUEJSDjufJFhpSnafTfNQ5Da++jsCqb+EfSkBd7PKxI2ny5N5RkNnSNTPhKAKehLWqGhNZ6ClpCHpvxkx0peRgOt5Y3etWEcA/cG9MdIALPcugegsCym+UzepyYH8omBBBIVqaMPzhkz8xRnsun1cNshi0M7IgSVcPOZx4Fc2LFqs8hdTXrrMRJPsa3MMaRmNzyVAM7pPomvF0Lp1ZOwQxEwkvF8pa90ioYP63RzwcV9eveKMQXNfIVjcMnOCL7M1IAToYj0jgw6SN7TZfdFqCIEOV7 \ No newline at end of file +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDkcNk748DAajCK3W99eLrc15nRGFeeEH4YLbsVd4gwNLzKsmVdm2oOAXl6Qb9nW2FIwsl37LR5dB/AU7lWQVICQ4CSdy9pwoWh6rd4tbobyMaQLDtx/oUXJlYBy7KBInSMxIPs2MRe9SG3BfhWvuj1m+bBSfqRQVj3YeE1M3pTMNHrYjDcdXusGITAxqNYDtN3+d4npVClavO5MuxQ4yr/vS8ibfvO21PMp2Sa9JtTXNX2Y1fF3xq0XT5UZd8YhnN/WWIaAxtkp3WMFLTOkFYTo+T3/C0Gsx6v+xCjKyytviquOJeLVJQ5ofP2RC0cSYdJJA1gs8bgUce3Sdp1+iij \ No newline at end of file diff --git a/files/ssh/known_hosts b/files/ssh/known_hosts index 53104cd..d6dd1e1 100644 --- a/files/ssh/known_hosts +++ b/files/ssh/known_hosts @@ -7,11 +7,11 @@ armadillo,armadillo.bleeding.bitmask.i,armadillo.bleeding.bitmask.net,1.209.122. canvasback,canvasback.cdev.bitmask.i,canvasback.cdev.bitmask.net,199.119.112.4 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBH5g/h43gZ3pQsU8ohme4J2mDeZgxGnd3lfR428GRqxKH4MEDGGrimpK1oPf6scey+oD8WYvSYP3ZjPFZHxyq4A= chameleon,chameleon.unstable.bitmask.i,chameleon.unstable.bitmask.net,199.119.112.10 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCbam3MYRlMunsimA/FMoS3qH03GcSTS7PPphE5es7oucWidaBp8HUKhl9SXTXe/98wYWTTMZPdWvjJvloWHxTAH1nt/TQxcCRZLPjaInt7NUo3aV5u0ADNaBKvcI8mFZMECSOol8ss+2+HHaqN3AQXcrotClz0vDb0a/9wPBKO0/oYR9PaDBR2wqq5TpOQn7lLmvygMCxvMr9PGgn02RnVsMHQ7qBH+Dk2MDM9DqT4Nr/WW61kwQKv1G/cfAD0MFN2HHMBj6Tx4pHPgTm9GhlEGmkUzykNSrqkg5V69peqeDTkNTkWy6WIwzk0Td7ohhLypa4dMUB5miSPHObrKSDJ chipmonk,chipmonk.cdev.bitmask.i,chipmonk.cdev.bitmask.net,199.119.112.19 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDyqIb8/kigC0IUCVFlIKmhp5+C/P2W7d71jMX6ZK9XAzRzxFdMmcvn5H6ypUsLWQ7r327nD1bRupKiYdmPWrWk= -clam,clam.dev.bitmask.i,clam.dev.bitmask.net,176.53.69.22 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCajNm7/fQTZGrPHlAQvViRyJNw0VUYfY8O7BAQxEPsBkyShRoSLm/naDn62TNrj8+Qp0P9A3JJAFmHz3R26Qy2EibBVHzSPhPbNfC2tVCjT8nnvPQFdu2ZAnCG2VCdm/RmLrTXyAApkHXebD37GhTYOAaP2om3jV6KJpKnwYh4g7qPwC/o1h5O5F9HJKRV/aa32mwmxk7bttisDSru1AN/Ag2GibE7z6+HINKAhC4Ptyf0LReKShbPmrULHxfNXXlqNix280NeY/bqsWl03HAmttyRATXA+Repp92CLq24wJC5rBUw/1G8mGCz7HlmRiH72WeuA6mRZrrRoNODiAF +clam,clam.dev.bitmask.i,clam.dev.bitmask.net,176.53.69.22 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqXPBidNRThgSRlEeKFuLxnGf/kmkaHoBimkZRrN7kxhGAwYSrf5mtUGqVFWGcWMPYhqU1uGkZnCgQWV9d60OmWNIZNqsq5Rs343PGKW9S3LrnAa0yFZKLRtESCh53taxF+uJ/vcV76oai+I7b2EZOVtUP6F+iSb3/D+piAcL+p284KkKywsj9FREoh+dpMHthSb7bQDSKqq9UZJVEDQev1tjT7FHnbIY0QJLcYBtYbj945G63UYPQbHVxkl2GCaTXLKaC5CfLRH6cHvwLS3HtyCFEgo9fw0BqztN+Q50+YiQYlKmY6DEnMxwyB7/CjzBcDPa+e0qXygV2mjaHsuN9 deer,deer.dev.bitmask.i,deer.dev.bitmask.net,202.85.233.34 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFAlVLkQ2644Lq7HCw6Sf7dxNNAXzkNg0owBqwAMV73OFeFZJadxQENQ/9bJKKQSst7LBXnlNNW4IDnVu1Hc9p6iWDfxFxUqzz1PJQcZy6qTOQXcMR59Wd6GEpXtjjWeKD6N+LxIJdtUYajHEbet7mF9SeZUIN/f1JJ8SetwI6GZeqLywvdeLlVl4CvRZ0EePazsYY6rkGRMaZeNYfY+bUHtY67eth/tO1gEvwnXkYCIkfVxYHruOxyGENPimI8tW9dSuTF8yxwfuyJlPldgYs0Oln4o4rE5/694UiGZK+NUbtansNgE2BrTUv9aeGjohRE9G+6Pjidsm5cxnnEwPd demodex,demodex.dev.bitmask.i,demodex.dev.bitmask.net,204.13.164.171 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2iNuS97BTd7flA/8nho/w3+THNriQPf1IpgcI/TCaTxIG5T85FRIApNAIxayJjBAt9C/MM8LMUlpRTq1Y8vlpYmfcWAJj5V8bbP03TXNIkgK8rtStjN061bhWXo4AVfD1hFyL+wUrdGRX2laaJvOgMO+UCkYb9PPqEfyKCMhcu3Da7auznYucrNxcJwCU4TpVgmQDYE0DWpYkssTbGJ7YJOZAtwNWtOrZFVRzOvMy3WvAM/s0x/ME6CQi6k6dDHlSpafhPAl/B4koTtnPksmXc7xCpmaun1j68C0yvD1l9QBPKyFwJ1KCJgx+9++CqnSFbIbX3ebb0FGtMHrak2xL -elephant,elephant.dev.bitmask.i,elephant.dev.bitmask.net,176.53.69.13 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCYskvUxkCVcQlJksuQJKV4S8YA3kefBHQio4X1BU2d8OJxv/GrrFsjzcsitjjmo77Y7bscOzyt/L+cCSwgfzAmtK3uwv31SgV6eQRJlXpf/HrtK5VQQVj/qe1R/R2fn4ij++sDkNfofuHqo68U1LjSZoqvTG5lExiXnN0GJKF9SwZ7t0/72Nm8DU4i6YQ+89VPU0xZdR1USyz2c++MaseizNra1vr4pxF0GmYnY4xB/UNmRvPRvPrwNCp1I3twnFE9onVWV6HUaMB4hHXqksUE4uGHlkO+LxniceyQTzqhlN1brwF92jbP+0QtsFfFdrAbdLVxxEbTvNU9WonpU+AL -elk,elk.dev.bitmask.i,elk.dev.bitmask.net,1.209.122.22 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAQhe04n0cSyx0VXXZnYiYPA1+1jOVmNV9u+sf2T0zhOrWIuX0i9+anzwtKdGaIu659Sus59EoyHYioHXfd7KPT/k0HupHu8K68J6L3pS8Jsdbpf8Ud76FcxJRqB9VbjFJ3GAO+Me7xaIFFtvwyVq2RkGdGaIhwvyq5yodJfPk33GJOxGh9J2I2Gn1xSLROWnz+ve7hrrpoysoGRbrrIMIrvHXH6ncrxKsubr7j5Pc+zQz1JY63A0bNQQSv+mZY2cLR/7vTFWurmlz58hKUfyaC6c6cHska7cuuYdEw//iQxN7v156IudZODhBn71mzfQiXi7Bsa2pfZwKFqctfbsz +elephant,elephant.dev.bitmask.i,elephant.dev.bitmask.net,176.53.69.13 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7XlP9uTmyHhP8x3ZqKZZfAiUtrVueWm+5yYJ1hJYHv9+o3WLN3AAv8q+ISd5AHE8XyHgXUZHfYZ8kOtF4DqPAXshhXxvmoRu5bSl+H36q0wFDUkM5z97IM46/ryDaQD0JlgNkZPARlHqZbKOf8ge4uVRxgV18bw9+E8aoNkjnMnC6TZBjXmpwa1tnIrfRN0NEEBYUyN8Hz8zZ0FA6o3q6FvWq1UzCntU4lhzvFV83PzU7r1tnUr8qWiVw708oPTduK9Lvzx7jgpNJYDKlCUJscXfwL4CYtn9AzaCTS1LsbH0apr7ccGatFwZ+6SRZQ9wUCsd6vP2reM93MTyYVg7N +elk,elk.dev.bitmask.i,elk.dev.bitmask.net,1.209.122.21 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrcf0LAT87yXYy8D6M2cnn88Cq+sHn+yCc5bApC8eDAsnEhU85AM23uPPlhvrGUlC2sWq5027693OOiUeoWuIv62J0ezggw4m8NLp8Y1zWsx9jS7y3wUHjGmZcB/abWUOLLT9ouQoZeGRqix0jaSkO1VnjRwKzPPhLYhbsxuVVy2hvAWDoV0ufaJi1N+wpqPzDrUa5SrlEyGbhnPiA+AlVU6GyCxB/DV+PiURf+W52dDeiFkOGlPgwu4vzMj1nes6wrQKTguINBw+6tTIF3C6hIqtbIRu+EVV4JFQ/UjuaZ57ubw616R3BC8IJdwSycZ3TFbEDLRpG9AkKS/OBI8OV frog,frog.bitmask.i,frog.bitmask.net,199.119.112.23 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNurBzA0Yk4smJr9x+EttnpdaZg9FNnWTl+JKwmYBMXxaoh+W0fOCkooA5DuQq/e6V/BmJC5WoerFWhV2oxSs5w= gadwall,gadwall.cdev.bitmask.i,gadwall.cdev.bitmask.net,199.119.112.5 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC4ycn7GabjeeewBmzTUbH+rZjRQV9seFmqbW2o5cE4jLsbPIMcMRRwLhA7TfIRLL7bLyuRNUWXwOqKZb/Psiog= gorilla,gorilla.bleeding.bitmask.i,gorilla.bleeding.bitmask.net,1.209.122.26 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAvgagCu3wyJizByW+JMLGn0CcMIDSxBU0QdBqcu65DDKOyJvVWL2fSHEOu0xdVmQow7ecoirrJZqL6VzrFVp8ur1Rn7+IR2RdtADtel4dbi7Hr1PuvNTKuE/NsRtX3p+zZHEl6SkFBVIgInlfezQxyytyLzL5mCjUCIe74krHDrU9bLkIwet3V/33SHjNYvv4BZ0VxCjvioI6iallhTw0ysizNFrbt3gyOCmS64E9qZWzYhzYUz8lF6nGpjNuwFcqrnZ0UN9Pk9905YuVAjO9H9kAIEKQ+bqAY0va8jcVC7NRKv3n5E7JFbr4SzSoOLulmkVDPRimax2XEt1fA8vr @@ -24,8 +24,8 @@ octopus,octopus.unstable.bitmask.i,octopus.unstable.bitmask.net,199.119.112.16 s 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 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLU8dg8lzmOOjQGfBvbUlDjyClqcxSDyCanP2Z4j8GU24a5sHTLydLIs2FM6xY/HmvZx1pBe7V/4gXVHG3Ym8P+kC/H6gybZIQpIZpjDzx5VsuZSeMk0PaEKCvMw3vbGcrKvtJWUw9aF9E5b/nDB3d/uy/EdW01wpEv8OQzqtNmoodVW9G8sxcdp+VzsowK1W7wMYcau7f1BzIxEnUnZaA0HWRiMYR0ggFfyO1P64X3KeVD4mv1xf243cqDSt2ODoZBcdp42Y/hn6ARCZUK8tpyFWvohLJOf5JNwX7I47czSd7SIFRLnncV1d5K6Egf9pFLaJPaTXC6chmv7Xvl6ut -starfish,starfish.dev.bitmask.i,starfish.dev.bitmask.net,176.53.69.23 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQClQH3zJNBilfI6FeMR9xi3HPZPK0GD0frwJyfAtaCRaWdJAXwO/kjScrOeF+JWgaDL3Ej7nRz3lo2qeQKRhC2HawA+dDSZKbreOg5nghEFT4NY5h8brKLk0/d7+8fUofsyTRrS+gfAauqxiRcmcy8prMiAdLL8SWcb9ylExq9AvxovIJ1CPZ59PL5Hc/REFybnux1y2qdQ0IewZ4DKx16/0NLArIYxNNwRn3qp8Vy1I/2VPpwpeH8kgN+v4/9iL32TM5dLlZ4uKed/WTSKyWalN1HbAGgV5Sx9KXmPoo/0l/CqCAJzLqttACWZbutE+O6fQqYg7o7idhQ6VDE2YKe/ +snail,snail.dev.bitmask.i,snail.dev.bitmask.net,176.53.69.14 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGhGw8BA+EBnkf0puixL34qlzciMCnVfot3OySQp5bRlrTYkHnsbjjHjj0UmccQMHLOdo06wK8vgWWuXOL6kH/FFZ3EumoIwrt5Nfwe2kIvPtJNlgqCEGCA9fkZSffQdbkdfgH68XCPDClgKeol5lp/epuDu3FBAU7ZglQCnbljSEUDmlGfn2rc06QikmnzvetDrLllV78KwIseclx/2zb97+JAiTcPIEYxWW7LKOoHwOYXVo4mJNMMOcuaEyomhO1j3TMWOcmvEwFdwyF34dhN4Hte6Tqz4StNd7T7xezu2qZ8dCQ59S4G80zZuAfHoZxqzbR5DSq/MF7lblGpgHt +starfish,starfish.dev.bitmask.i,starfish.dev.bitmask.net,176.53.69.23 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCkbUoYD7f7Sbl+ElkJmxopRXh21DhcrVfFqlUwSdSpnAtgTSFRC1JMrDkPdJ69htsYiwoB+Bed0FQyCB4NU0QJbgM73VXJ0SqrpJJKx/7Ry5E8aBukiaAe8k8O6ZbnPeoZx11PwrSlS9Wrh928tuH7/ism7XHytlFYayYywvY2djIy9TbLsuOV6EQmVAVONhRVet4iOiFqfFDplRjttFVMJROO8W51YDdcTEwR+gLwS7yKp3e/XZT1vrHzmKo7j9saEgC0KncJrGDqoZ0Q1U0Did+MmHRQTJ13TcjHDnCiU7nO9w6OgGo4nTzGOJCjJkJm8opCxT3X0jCcHIkmEIU/ thrips,thrips.demo.bitmask.i,thrips.demo.bitmask.net,204.13.164.162 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIJHNnsfeuNBkVRm7cJvgD0rTX1wztnoz9SuHK2vJ9Pcluo8VfFoQrwayoFiAPJNC0dOoSra0Ir9L/eNQtjEzW0= -urchin,urchin.dev.bitmask.i,urchin.dev.bitmask.net,176.53.69.21 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC5KHWPUGhpPTvgDCyUeg59eYHN6QEPUck37GlKeRod24M2ShqsYB9F2Awg8fUEJSDjufJFhpSnafTfNQ5Da++jsCqb+EfSkBd7PKxI2ny5N5RkNnSNTPhKAKehLWqGhNZ6ClpCHpvxkx0peRgOt5Y3etWEcA/cG9MdIALPcugegsCym+UzepyYH8omBBBIVqaMPzhkz8xRnsun1cNshi0M7IgSVcPOZx4Fc2LFqs8hdTXrrMRJPsa3MMaRmNzyVAM7pPomvF0Lp1ZOwQxEwkvF8pa90ioYP63RzwcV9eveKMQXNfIVjcMnOCL7M1IAToYj0jgw6SN7TZfdFqCIEOV7 +urchin,urchin.dev.bitmask.i,urchin.dev.bitmask.net,176.53.69.21 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDkcNk748DAajCK3W99eLrc15nRGFeeEH4YLbsVd4gwNLzKsmVdm2oOAXl6Qb9nW2FIwsl37LR5dB/AU7lWQVICQ4CSdy9pwoWh6rd4tbobyMaQLDtx/oUXJlYBy7KBInSMxIPs2MRe9SG3BfhWvuj1m+bBSfqRQVj3YeE1M3pTMNHrYjDcdXusGITAxqNYDtN3+d4npVClavO5MuxQ4yr/vS8ibfvO21PMp2Sa9JtTXNX2Y1fF3xq0XT5UZd8YhnN/WWIaAxtkp3WMFLTOkFYTo+T3/C0Gsx6v+xCjKyytviquOJeLVJQ5ofP2RC0cSYdJJA1gs8bgUce3Sdp1+iij wallaby,wallaby.demo.bitmask.i,wallaby.demo.bitmask.net,204.13.164.57 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP/bJJ5OoSveoTEXAl26Gz0tqJkwzdA2fezMFeyoDDF6BCWntfzFZahoxHWg5alUfNMCJeYYOPYu/k05QzXThkQ= diff --git a/hiera/ant.yaml b/hiera/ant.yaml index 29f5d68..fb4fd75 100644 --- a/hiera/ant.yaml +++ b/hiera/ant.yaml @@ -85,36 +85,11 @@ mail: - leech.demo.bitmask.net name: ant platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" service_type: internal_service services: - couchdb -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git ssh: authorized_keys: azul: diff --git a/hiera/armadillo.yaml b/hiera/armadillo.yaml index 38863a0..caed966 100644 --- a/hiera/armadillo.yaml +++ b/hiera/armadillo.yaml @@ -5,7 +5,6 @@ apt: basic: "http://ftp.daum.net/debian/" contacts: - sysdev@leap.se - - varac@leap.se couch: bigcouch: cookie: A7MD6YCHa9yBbxRGxkcy8VuxWafBmwgB @@ -84,35 +83,10 @@ mail: name: armadillo platform: major_version: "0.6" - version: "0.6.1" + version: "0.6" service_type: internal_service services: - couchdb -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.6.1 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.6 - source: "https://leap.se/git/leap_web" - type: git ssh: authorized_keys: azul: diff --git a/hiera/chameleon.yaml b/hiera/chameleon.yaml index b9861b9..91e4015 100644 --- a/hiera/chameleon.yaml +++ b/hiera/chameleon.yaml @@ -200,7 +200,7 @@ hosts: clam: domain_full: clam.dev.bitmask.net domain_internal: clam.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCajNm7/fQTZGrPHlAQvViRyJNw0VUYfY8O7BAQxEPsBkyShRoSLm/naDn62TNrj8+Qp0P9A3JJAFmHz3R26Qy2EibBVHzSPhPbNfC2tVCjT8nnvPQFdu2ZAnCG2VCdm/RmLrTXyAApkHXebD37GhTYOAaP2om3jV6KJpKnwYh4g7qPwC/o1h5O5F9HJKRV/aa32mwmxk7bttisDSru1AN/Ag2GibE7z6+HINKAhC4Ptyf0LReKShbPmrULHxfNXXlqNix280NeY/bqsWl03HAmttyRATXA+Repp92CLq24wJC5rBUw/1G8mGCz7HlmRiH72WeuA6mRZrrRoNODiAF" + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqXPBidNRThgSRlEeKFuLxnGf/kmkaHoBimkZRrN7kxhGAwYSrf5mtUGqVFWGcWMPYhqU1uGkZnCgQWV9d60OmWNIZNqsq5Rs343PGKW9S3LrnAa0yFZKLRtESCh53taxF+uJ/vcV76oai+I7b2EZOVtUP6F+iSb3/D+piAcL+p284KkKywsj9FREoh+dpMHthSb7bQDSKqq9UZJVEDQev1tjT7FHnbIY0QJLcYBtYbj945G63UYPQbHVxkl2GCaTXLKaC5CfLRH6cHvwLS3HtyCFEgo9fw0BqztN+Q50+YiQYlKmY6DEnMxwyB7/CjzBcDPa+e0qXygV2mjaHsuN9" ip_address: "176.53.69.22" port: 4422 deer: @@ -218,15 +218,15 @@ hosts: elephant: domain_full: elephant.dev.bitmask.net domain_internal: elephant.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCYskvUxkCVcQlJksuQJKV4S8YA3kefBHQio4X1BU2d8OJxv/GrrFsjzcsitjjmo77Y7bscOzyt/L+cCSwgfzAmtK3uwv31SgV6eQRJlXpf/HrtK5VQQVj/qe1R/R2fn4ij++sDkNfofuHqo68U1LjSZoqvTG5lExiXnN0GJKF9SwZ7t0/72Nm8DU4i6YQ+89VPU0xZdR1USyz2c++MaseizNra1vr4pxF0GmYnY4xB/UNmRvPRvPrwNCp1I3twnFE9onVWV6HUaMB4hHXqksUE4uGHlkO+LxniceyQTzqhlN1brwF92jbP+0QtsFfFdrAbdLVxxEbTvNU9WonpU+AL" + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7XlP9uTmyHhP8x3ZqKZZfAiUtrVueWm+5yYJ1hJYHv9+o3WLN3AAv8q+ISd5AHE8XyHgXUZHfYZ8kOtF4DqPAXshhXxvmoRu5bSl+H36q0wFDUkM5z97IM46/ryDaQD0JlgNkZPARlHqZbKOf8ge4uVRxgV18bw9+E8aoNkjnMnC6TZBjXmpwa1tnIrfRN0NEEBYUyN8Hz8zZ0FA6o3q6FvWq1UzCntU4lhzvFV83PzU7r1tnUr8qWiVw708oPTduK9Lvzx7jgpNJYDKlCUJscXfwL4CYtn9AzaCTS1LsbH0apr7ccGatFwZ+6SRZQ9wUCsd6vP2reM93MTyYVg7N" ip_address: "176.53.69.13" port: 4422 elk: domain_full: elk.dev.bitmask.net domain_internal: elk.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAQhe04n0cSyx0VXXZnYiYPA1+1jOVmNV9u+sf2T0zhOrWIuX0i9+anzwtKdGaIu659Sus59EoyHYioHXfd7KPT/k0HupHu8K68J6L3pS8Jsdbpf8Ud76FcxJRqB9VbjFJ3GAO+Me7xaIFFtvwyVq2RkGdGaIhwvyq5yodJfPk33GJOxGh9J2I2Gn1xSLROWnz+ve7hrrpoysoGRbrrIMIrvHXH6ncrxKsubr7j5Pc+zQz1JY63A0bNQQSv+mZY2cLR/7vTFWurmlz58hKUfyaC6c6cHska7cuuYdEw//iQxN7v156IudZODhBn71mzfQiXi7Bsa2pfZwKFqctfbsz" - ip_address: "1.209.122.22" - port: 22 + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrcf0LAT87yXYy8D6M2cnn88Cq+sHn+yCc5bApC8eDAsnEhU85AM23uPPlhvrGUlC2sWq5027693OOiUeoWuIv62J0ezggw4m8NLp8Y1zWsx9jS7y3wUHjGmZcB/abWUOLLT9ouQoZeGRqix0jaSkO1VnjRwKzPPhLYhbsxuVVy2hvAWDoV0ufaJi1N+wpqPzDrUa5SrlEyGbhnPiA+AlVU6GyCxB/DV+PiURf+W52dDeiFkOGlPgwu4vzMj1nes6wrQKTguINBw+6tTIF3C6hIqtbIRu+EVV4JFQ/UjuaZ57ubw616R3BC8IJdwSycZ3TFbEDLRpG9AkKS/OBI8OV" + ip_address: "1.209.122.21" + port: 4422 frog: domain_full: frog.bitmask.net domain_internal: frog.bitmask.i @@ -302,13 +302,13 @@ hosts: snail: domain_full: snail.dev.bitmask.net domain_internal: snail.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLU8dg8lzmOOjQGfBvbUlDjyClqcxSDyCanP2Z4j8GU24a5sHTLydLIs2FM6xY/HmvZx1pBe7V/4gXVHG3Ym8P+kC/H6gybZIQpIZpjDzx5VsuZSeMk0PaEKCvMw3vbGcrKvtJWUw9aF9E5b/nDB3d/uy/EdW01wpEv8OQzqtNmoodVW9G8sxcdp+VzsowK1W7wMYcau7f1BzIxEnUnZaA0HWRiMYR0ggFfyO1P64X3KeVD4mv1xf243cqDSt2ODoZBcdp42Y/hn6ARCZUK8tpyFWvohLJOf5JNwX7I47czSd7SIFRLnncV1d5K6Egf9pFLaJPaTXC6chmv7Xvl6ut" + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGhGw8BA+EBnkf0puixL34qlzciMCnVfot3OySQp5bRlrTYkHnsbjjHjj0UmccQMHLOdo06wK8vgWWuXOL6kH/FFZ3EumoIwrt5Nfwe2kIvPtJNlgqCEGCA9fkZSffQdbkdfgH68XCPDClgKeol5lp/epuDu3FBAU7ZglQCnbljSEUDmlGfn2rc06QikmnzvetDrLllV78KwIseclx/2zb97+JAiTcPIEYxWW7LKOoHwOYXVo4mJNMMOcuaEyomhO1j3TMWOcmvEwFdwyF34dhN4Hte6Tqz4StNd7T7xezu2qZ8dCQ59S4G80zZuAfHoZxqzbR5DSq/MF7lblGpgHt" ip_address: "176.53.69.14" port: 4422 starfish: domain_full: starfish.dev.bitmask.net domain_internal: starfish.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQClQH3zJNBilfI6FeMR9xi3HPZPK0GD0frwJyfAtaCRaWdJAXwO/kjScrOeF+JWgaDL3Ej7nRz3lo2qeQKRhC2HawA+dDSZKbreOg5nghEFT4NY5h8brKLk0/d7+8fUofsyTRrS+gfAauqxiRcmcy8prMiAdLL8SWcb9ylExq9AvxovIJ1CPZ59PL5Hc/REFybnux1y2qdQ0IewZ4DKx16/0NLArIYxNNwRn3qp8Vy1I/2VPpwpeH8kgN+v4/9iL32TM5dLlZ4uKed/WTSKyWalN1HbAGgV5Sx9KXmPoo/0l/CqCAJzLqttACWZbutE+O6fQqYg7o7idhQ6VDE2YKe/" + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCkbUoYD7f7Sbl+ElkJmxopRXh21DhcrVfFqlUwSdSpnAtgTSFRC1JMrDkPdJ69htsYiwoB+Bed0FQyCB4NU0QJbgM73VXJ0SqrpJJKx/7Ry5E8aBukiaAe8k8O6ZbnPeoZx11PwrSlS9Wrh928tuH7/ism7XHytlFYayYywvY2djIy9TbLsuOV6EQmVAVONhRVet4iOiFqfFDplRjttFVMJROO8W51YDdcTEwR+gLwS7yKp3e/XZT1vrHzmKo7j9saEgC0KncJrGDqoZ0Q1U0Did+MmHRQTJ13TcjHDnCiU7nO9w6OgGo4nTzGOJCjJkJm8opCxT3X0jCcHIkmEIU/" ip_address: "176.53.69.23" port: 4422 thrips: @@ -320,7 +320,7 @@ hosts: urchin: domain_full: urchin.dev.bitmask.net domain_internal: urchin.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC5KHWPUGhpPTvgDCyUeg59eYHN6QEPUck37GlKeRod24M2ShqsYB9F2Awg8fUEJSDjufJFhpSnafTfNQ5Da++jsCqb+EfSkBd7PKxI2ny5N5RkNnSNTPhKAKehLWqGhNZ6ClpCHpvxkx0peRgOt5Y3etWEcA/cG9MdIALPcugegsCym+UzepyYH8omBBBIVqaMPzhkz8xRnsun1cNshi0M7IgSVcPOZx4Fc2LFqs8hdTXrrMRJPsa3MMaRmNzyVAM7pPomvF0Lp1ZOwQxEwkvF8pa90ioYP63RzwcV9eveKMQXNfIVjcMnOCL7M1IAToYj0jgw6SN7TZfdFqCIEOV7" + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDkcNk748DAajCK3W99eLrc15nRGFeeEH4YLbsVd4gwNLzKsmVdm2oOAXl6Qb9nW2FIwsl37LR5dB/AU7lWQVICQ4CSdy9pwoWh6rd4tbobyMaQLDtx/oUXJlYBy7KBInSMxIPs2MRe9SG3BfhWvuj1m+bBSfqRQVj3YeE1M3pTMNHrYjDcdXusGITAxqNYDtN3+d4npVClavO5MuxQ4yr/vS8ibfvO21PMp2Sa9JtTXNX2Y1fF3xq0XT5UZd8YhnN/WWIaAxtkp3WMFLTOkFYTo+T3/C0Gsx6v+xCjKyytviquOJeLVJQ5ofP2RC0cSYdJJA1gs8bgUce3Sdp1+iij" ip_address: "176.53.69.21" port: 4422 wallaby: @@ -460,10 +460,10 @@ nagios: domain_internal: elk.dev.bitmask.i domain_internal_suffix: dev.bitmask.i environment: development - ip_address: "1.209.122.22" + ip_address: "1.209.122.21" services: - couchdb - ssh_port: 22 + ssh_port: 4422 frog: domain_full_suffix: bitmask.net domain_internal: frog.bitmask.i @@ -637,37 +637,12 @@ nickserver: domain: nicknym.unstable.bitmask.net port: 6425 platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" service_type: public_service services: - monitor - webapp -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git ssh: authorized_keys: azul: @@ -755,16 +730,12 @@ webapp: client_certificates: bit_size: 2048 digest: SHA256 - life_span: "2 months" + life_span: 2m limited_prefix: LIMITED unlimited_prefix: UNLIMITED client_version: max: ~ - min: "0.7" - couchdb_admin_user: - password: LYaDX9L9QKe2Re6p8dFKhu_t2XCxTqNZ - salt: b9d35fd378ba1598e843d5a784cfdf7e - username: admin + min: "0.5" couchdb_webapp_user: password: enfhmsmcLc3Az3GF6TFKwRk99Iqjm2ew salt: 478bf7e8ca879a9711b279055f00153e @@ -784,8 +755,10 @@ webapp: - maildrop - postmaster - ssladmin - - vmail - www-data + git: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" modules: - billing - help diff --git a/hiera/chipmonk.yaml b/hiera/chipmonk.yaml index 5f990f1..23e6eb7 100644 --- a/hiera/chipmonk.yaml +++ b/hiera/chipmonk.yaml @@ -50,7 +50,7 @@ location: mail: smarthost: [] mynetworks: - - "1.209.122.22" + - "1.209.122.21" - "1.209.122.24" - "1.209.122.26" - "176.53.69.13" diff --git a/hiera/clam.yaml b/hiera/clam.yaml index 44aeef8..89a9456 100644 --- a/hiera/clam.yaml +++ b/hiera/clam.yaml @@ -60,25 +60,25 @@ hosts: clam: domain_full: clam.dev.bitmask.net domain_internal: clam.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCajNm7/fQTZGrPHlAQvViRyJNw0VUYfY8O7BAQxEPsBkyShRoSLm/naDn62TNrj8+Qp0P9A3JJAFmHz3R26Qy2EibBVHzSPhPbNfC2tVCjT8nnvPQFdu2ZAnCG2VCdm/RmLrTXyAApkHXebD37GhTYOAaP2om3jV6KJpKnwYh4g7qPwC/o1h5O5F9HJKRV/aa32mwmxk7bttisDSru1AN/Ag2GibE7z6+HINKAhC4Ptyf0LReKShbPmrULHxfNXXlqNix280NeY/bqsWl03HAmttyRATXA+Repp92CLq24wJC5rBUw/1G8mGCz7HlmRiH72WeuA6mRZrrRoNODiAF" + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqXPBidNRThgSRlEeKFuLxnGf/kmkaHoBimkZRrN7kxhGAwYSrf5mtUGqVFWGcWMPYhqU1uGkZnCgQWV9d60OmWNIZNqsq5Rs343PGKW9S3LrnAa0yFZKLRtESCh53taxF+uJ/vcV76oai+I7b2EZOVtUP6F+iSb3/D+piAcL+p284KkKywsj9FREoh+dpMHthSb7bQDSKqq9UZJVEDQev1tjT7FHnbIY0QJLcYBtYbj945G63UYPQbHVxkl2GCaTXLKaC5CfLRH6cHvwLS3HtyCFEgo9fw0BqztN+Q50+YiQYlKmY6DEnMxwyB7/CjzBcDPa+e0qXygV2mjaHsuN9" ip_address: "176.53.69.22" port: 4422 elk: domain_full: elk.dev.bitmask.net domain_internal: elk.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAQhe04n0cSyx0VXXZnYiYPA1+1jOVmNV9u+sf2T0zhOrWIuX0i9+anzwtKdGaIu659Sus59EoyHYioHXfd7KPT/k0HupHu8K68J6L3pS8Jsdbpf8Ud76FcxJRqB9VbjFJ3GAO+Me7xaIFFtvwyVq2RkGdGaIhwvyq5yodJfPk33GJOxGh9J2I2Gn1xSLROWnz+ve7hrrpoysoGRbrrIMIrvHXH6ncrxKsubr7j5Pc+zQz1JY63A0bNQQSv+mZY2cLR/7vTFWurmlz58hKUfyaC6c6cHska7cuuYdEw//iQxN7v156IudZODhBn71mzfQiXi7Bsa2pfZwKFqctfbsz" - ip_address: "1.209.122.22" - port: 22 + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrcf0LAT87yXYy8D6M2cnn88Cq+sHn+yCc5bApC8eDAsnEhU85AM23uPPlhvrGUlC2sWq5027693OOiUeoWuIv62J0ezggw4m8NLp8Y1zWsx9jS7y3wUHjGmZcB/abWUOLLT9ouQoZeGRqix0jaSkO1VnjRwKzPPhLYhbsxuVVy2hvAWDoV0ufaJi1N+wpqPzDrUa5SrlEyGbhnPiA+AlVU6GyCxB/DV+PiURf+W52dDeiFkOGlPgwu4vzMj1nes6wrQKTguINBw+6tTIF3C6hIqtbIRu+EVV4JFQ/UjuaZ57ubw616R3BC8IJdwSycZ3TFbEDLRpG9AkKS/OBI8OV" + ip_address: "1.209.122.21" + port: 4422 starfish: domain_full: starfish.dev.bitmask.net domain_internal: starfish.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQClQH3zJNBilfI6FeMR9xi3HPZPK0GD0frwJyfAtaCRaWdJAXwO/kjScrOeF+JWgaDL3Ej7nRz3lo2qeQKRhC2HawA+dDSZKbreOg5nghEFT4NY5h8brKLk0/d7+8fUofsyTRrS+gfAauqxiRcmcy8prMiAdLL8SWcb9ylExq9AvxovIJ1CPZ59PL5Hc/REFybnux1y2qdQ0IewZ4DKx16/0NLArIYxNNwRn3qp8Vy1I/2VPpwpeH8kgN+v4/9iL32TM5dLlZ4uKed/WTSKyWalN1HbAGgV5Sx9KXmPoo/0l/CqCAJzLqttACWZbutE+O6fQqYg7o7idhQ6VDE2YKe/" + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCkbUoYD7f7Sbl+ElkJmxopRXh21DhcrVfFqlUwSdSpnAtgTSFRC1JMrDkPdJ69htsYiwoB+Bed0FQyCB4NU0QJbgM73VXJ0SqrpJJKx/7Ry5E8aBukiaAe8k8O6ZbnPeoZx11PwrSlS9Wrh928tuH7/ism7XHytlFYayYywvY2djIy9TbLsuOV6EQmVAVONhRVet4iOiFqfFDplRjttFVMJROO8W51YDdcTEwR+gLwS7yKp3e/XZT1vrHzmKo7j9saEgC0KncJrGDqoZ0Q1U0Did+MmHRQTJ13TcjHDnCiU7nO9w6OgGo4nTzGOJCjJkJm8opCxT3X0jCcHIkmEIU/" ip_address: "176.53.69.23" port: 4422 urchin: domain_full: urchin.dev.bitmask.net domain_internal: urchin.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC5KHWPUGhpPTvgDCyUeg59eYHN6QEPUck37GlKeRod24M2ShqsYB9F2Awg8fUEJSDjufJFhpSnafTfNQ5Da++jsCqb+EfSkBd7PKxI2ny5N5RkNnSNTPhKAKehLWqGhNZ6ClpCHpvxkx0peRgOt5Y3etWEcA/cG9MdIALPcugegsCym+UzepyYH8omBBBIVqaMPzhkz8xRnsun1cNshi0M7IgSVcPOZx4Fc2LFqs8hdTXrrMRJPsa3MMaRmNzyVAM7pPomvF0Lp1ZOwQxEwkvF8pa90ioYP63RzwcV9eveKMQXNfIVjcMnOCL7M1IAToYj0jgw6SN7TZfdFqCIEOV7" + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDkcNk748DAajCK3W99eLrc15nRGFeeEH4YLbsVd4gwNLzKsmVdm2oOAXl6Qb9nW2FIwsl37LR5dB/AU7lWQVICQ4CSdy9pwoWh6rd4tbobyMaQLDtx/oUXJlYBy7KBInSMxIPs2MRe9SG3BfhWvuj1m+bBSfqRQVj3YeE1M3pTMNHrYjDcdXusGITAxqNYDtN3+d4npVClavO5MuxQ4yr/vS8ibfvO21PMp2Sa9JtTXNX2Y1fF3xq0XT5UZd8YhnN/WWIaAxtkp3WMFLTOkFYTo+T3/C0Gsx6v+xCjKyytviquOJeLVJQ5ofP2RC0cSYdJJA1gs8bgUce3Sdp1+iij" ip_address: "176.53.69.21" port: 4422 ip_address: "176.53.69.22" @@ -92,8 +92,8 @@ mail: - starfish.dev.bitmask.net name: clam platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" service_type: public_service services: - couchdb @@ -105,31 +105,6 @@ soledad: username: soledad port: 2323 require_couchdb: true -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git ssh: authorized_keys: azul: diff --git a/hiera/couch1.yaml b/hiera/couch1.yaml index 2ed53d3..e22ff7b 100644 --- a/hiera/couch1.yaml +++ b/hiera/couch1.yaml @@ -77,8 +77,8 @@ mail: - mx1.bitmask.net name: couch1 platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" service_type: public_service services: - couchdb @@ -90,31 +90,6 @@ soledad: username: soledad port: 2323 require_couchdb: true -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git squid_deb_proxy_client: true ssh: authorized_keys: diff --git a/hiera/couch2.yaml b/hiera/couch2.yaml index 2d21f49..d42d2f6 100644 --- a/hiera/couch2.yaml +++ b/hiera/couch2.yaml @@ -77,8 +77,8 @@ mail: - mx1.bitmask.net name: couch2 platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" service_type: public_service services: - couchdb @@ -90,31 +90,6 @@ soledad: username: soledad port: 2323 require_couchdb: true -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git squid_deb_proxy_client: true ssh: authorized_keys: diff --git a/hiera/deer.yaml b/hiera/deer.yaml index 2ef4356..a178a44 100644 --- a/hiera/deer.yaml +++ b/hiera/deer.yaml @@ -26,36 +26,11 @@ mail: - starfish.dev.bitmask.net name: deer platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" service_type: internal_service services: - tor -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git ssh: authorized_keys: azul: diff --git a/hiera/demodex.yaml b/hiera/demodex.yaml index f98605b..192ed94 100644 --- a/hiera/demodex.yaml +++ b/hiera/demodex.yaml @@ -26,36 +26,11 @@ mail: - starfish.dev.bitmask.net name: demodex platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" service_type: internal_service services: - backup -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git ssh: authorized_keys: azul: diff --git a/hiera/elephant.yaml b/hiera/elephant.yaml index bb1dc0f..8c05b53 100644 --- a/hiera/elephant.yaml +++ b/hiera/elephant.yaml @@ -168,10 +168,10 @@ haproxy: weight: 100 writable: true elk: - backup: false + backup: true host: localhost port: 4001 - weight: 100 + weight: 10 writable: true urchin: backup: false @@ -183,25 +183,25 @@ hosts: clam: domain_full: clam.dev.bitmask.net domain_internal: clam.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCajNm7/fQTZGrPHlAQvViRyJNw0VUYfY8O7BAQxEPsBkyShRoSLm/naDn62TNrj8+Qp0P9A3JJAFmHz3R26Qy2EibBVHzSPhPbNfC2tVCjT8nnvPQFdu2ZAnCG2VCdm/RmLrTXyAApkHXebD37GhTYOAaP2om3jV6KJpKnwYh4g7qPwC/o1h5O5F9HJKRV/aa32mwmxk7bttisDSru1AN/Ag2GibE7z6+HINKAhC4Ptyf0LReKShbPmrULHxfNXXlqNix280NeY/bqsWl03HAmttyRATXA+Repp92CLq24wJC5rBUw/1G8mGCz7HlmRiH72WeuA6mRZrrRoNODiAF" + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqXPBidNRThgSRlEeKFuLxnGf/kmkaHoBimkZRrN7kxhGAwYSrf5mtUGqVFWGcWMPYhqU1uGkZnCgQWV9d60OmWNIZNqsq5Rs343PGKW9S3LrnAa0yFZKLRtESCh53taxF+uJ/vcV76oai+I7b2EZOVtUP6F+iSb3/D+piAcL+p284KkKywsj9FREoh+dpMHthSb7bQDSKqq9UZJVEDQev1tjT7FHnbIY0QJLcYBtYbj945G63UYPQbHVxkl2GCaTXLKaC5CfLRH6cHvwLS3HtyCFEgo9fw0BqztN+Q50+YiQYlKmY6DEnMxwyB7/CjzBcDPa+e0qXygV2mjaHsuN9" ip_address: "176.53.69.22" port: 4422 elk: domain_full: elk.dev.bitmask.net domain_internal: elk.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAQhe04n0cSyx0VXXZnYiYPA1+1jOVmNV9u+sf2T0zhOrWIuX0i9+anzwtKdGaIu659Sus59EoyHYioHXfd7KPT/k0HupHu8K68J6L3pS8Jsdbpf8Ud76FcxJRqB9VbjFJ3GAO+Me7xaIFFtvwyVq2RkGdGaIhwvyq5yodJfPk33GJOxGh9J2I2Gn1xSLROWnz+ve7hrrpoysoGRbrrIMIrvHXH6ncrxKsubr7j5Pc+zQz1JY63A0bNQQSv+mZY2cLR/7vTFWurmlz58hKUfyaC6c6cHska7cuuYdEw//iQxN7v156IudZODhBn71mzfQiXi7Bsa2pfZwKFqctfbsz" - ip_address: "1.209.122.22" - port: 22 + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrcf0LAT87yXYy8D6M2cnn88Cq+sHn+yCc5bApC8eDAsnEhU85AM23uPPlhvrGUlC2sWq5027693OOiUeoWuIv62J0ezggw4m8NLp8Y1zWsx9jS7y3wUHjGmZcB/abWUOLLT9ouQoZeGRqix0jaSkO1VnjRwKzPPhLYhbsxuVVy2hvAWDoV0ufaJi1N+wpqPzDrUa5SrlEyGbhnPiA+AlVU6GyCxB/DV+PiURf+W52dDeiFkOGlPgwu4vzMj1nes6wrQKTguINBw+6tTIF3C6hIqtbIRu+EVV4JFQ/UjuaZ57ubw616R3BC8IJdwSycZ3TFbEDLRpG9AkKS/OBI8OV" + ip_address: "1.209.122.21" + port: 4422 starfish: domain_full: starfish.dev.bitmask.net domain_internal: starfish.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQClQH3zJNBilfI6FeMR9xi3HPZPK0GD0frwJyfAtaCRaWdJAXwO/kjScrOeF+JWgaDL3Ej7nRz3lo2qeQKRhC2HawA+dDSZKbreOg5nghEFT4NY5h8brKLk0/d7+8fUofsyTRrS+gfAauqxiRcmcy8prMiAdLL8SWcb9ylExq9AvxovIJ1CPZ59PL5Hc/REFybnux1y2qdQ0IewZ4DKx16/0NLArIYxNNwRn3qp8Vy1I/2VPpwpeH8kgN+v4/9iL32TM5dLlZ4uKed/WTSKyWalN1HbAGgV5Sx9KXmPoo/0l/CqCAJzLqttACWZbutE+O6fQqYg7o7idhQ6VDE2YKe/" + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCkbUoYD7f7Sbl+ElkJmxopRXh21DhcrVfFqlUwSdSpnAtgTSFRC1JMrDkPdJ69htsYiwoB+Bed0FQyCB4NU0QJbgM73VXJ0SqrpJJKx/7Ry5E8aBukiaAe8k8O6ZbnPeoZx11PwrSlS9Wrh928tuH7/ism7XHytlFYayYywvY2djIy9TbLsuOV6EQmVAVONhRVet4iOiFqfFDplRjttFVMJROO8W51YDdcTEwR+gLwS7yKp3e/XZT1vrHzmKo7j9saEgC0KncJrGDqoZ0Q1U0Did+MmHRQTJ13TcjHDnCiU7nO9w6OgGo4nTzGOJCjJkJm8opCxT3X0jCcHIkmEIU/" ip_address: "176.53.69.23" port: 4422 urchin: domain_full: urchin.dev.bitmask.net domain_internal: urchin.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC5KHWPUGhpPTvgDCyUeg59eYHN6QEPUck37GlKeRod24M2ShqsYB9F2Awg8fUEJSDjufJFhpSnafTfNQ5Da++jsCqb+EfSkBd7PKxI2ny5N5RkNnSNTPhKAKehLWqGhNZ6ClpCHpvxkx0peRgOt5Y3etWEcA/cG9MdIALPcugegsCym+UzepyYH8omBBBIVqaMPzhkz8xRnsun1cNshi0M7IgSVcPOZx4Fc2LFqs8hdTXrrMRJPsa3MMaRmNzyVAM7pPomvF0Lp1ZOwQxEwkvF8pa90ioYP63RzwcV9eveKMQXNfIVjcMnOCL7M1IAToYj0jgw6SN7TZfdFqCIEOV7" + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDkcNk748DAajCK3W99eLrc15nRGFeeEH4YLbsVd4gwNLzKsmVdm2oOAXl6Qb9nW2FIwsl37LR5dB/AU7lWQVICQ4CSdy9pwoWh6rd4tbobyMaQLDtx/oUXJlYBy7KBInSMxIPs2MRe9SG3BfhWvuj1m+bBSfqRQVj3YeE1M3pTMNHrYjDcdXusGITAxqNYDtN3+d4npVClavO5MuxQ4yr/vS8ibfvO21PMp2Sa9JtTXNX2Y1fF3xq0XT5UZd8YhnN/WWIaAxtkp3WMFLTOkFYTo+T3/C0Gsx6v+xCjKyytviquOJeLVJQ5ofP2RC0cSYdJJA1gs8bgUce3Sdp1+iij" ip_address: "176.53.69.21" port: 4422 ip_address: "176.53.69.13" @@ -222,36 +222,11 @@ nickserver: domain: nicknym.dev.bitmask.net port: 6425 platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" service_type: public_service services: - webapp -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git ssh: authorized_keys: azul: @@ -339,11 +314,7 @@ webapp: unlimited_prefix: UNLIMITED client_version: max: ~ - min: "0.7" - couchdb_admin_user: - password: PkyRLKGfQAnmk64EXqHWBVsxJfksKXNH - salt: 51d3c78980b9cf319cadbc73896f7128 - username: admin + min: "0.5" couchdb_webapp_user: password: PvRAdP9JrjS8qRsNCpyQ_KVDBTgTNGkY salt: 86497f034c8ef09b097f5c757ab038b7 @@ -364,6 +335,9 @@ webapp: - postmaster - ssladmin - www-data + git: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" modules: - billing - help diff --git a/hiera/elk.yaml b/hiera/elk.yaml index 6878974..9e68e0d 100644 --- a/hiera/elk.yaml +++ b/hiera/elk.yaml @@ -1,4 +1,8 @@ --- +apt: + url: + backports: "http://ftp.daum.net/debian/" + basic: "http://ftp.daum.net/debian/" contacts: - micah@leap.se - sysdev@leap.se @@ -60,68 +64,43 @@ hosts: clam: domain_full: clam.dev.bitmask.net domain_internal: clam.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCajNm7/fQTZGrPHlAQvViRyJNw0VUYfY8O7BAQxEPsBkyShRoSLm/naDn62TNrj8+Qp0P9A3JJAFmHz3R26Qy2EibBVHzSPhPbNfC2tVCjT8nnvPQFdu2ZAnCG2VCdm/RmLrTXyAApkHXebD37GhTYOAaP2om3jV6KJpKnwYh4g7qPwC/o1h5O5F9HJKRV/aa32mwmxk7bttisDSru1AN/Ag2GibE7z6+HINKAhC4Ptyf0LReKShbPmrULHxfNXXlqNix280NeY/bqsWl03HAmttyRATXA+Repp92CLq24wJC5rBUw/1G8mGCz7HlmRiH72WeuA6mRZrrRoNODiAF" + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqXPBidNRThgSRlEeKFuLxnGf/kmkaHoBimkZRrN7kxhGAwYSrf5mtUGqVFWGcWMPYhqU1uGkZnCgQWV9d60OmWNIZNqsq5Rs343PGKW9S3LrnAa0yFZKLRtESCh53taxF+uJ/vcV76oai+I7b2EZOVtUP6F+iSb3/D+piAcL+p284KkKywsj9FREoh+dpMHthSb7bQDSKqq9UZJVEDQev1tjT7FHnbIY0QJLcYBtYbj945G63UYPQbHVxkl2GCaTXLKaC5CfLRH6cHvwLS3HtyCFEgo9fw0BqztN+Q50+YiQYlKmY6DEnMxwyB7/CjzBcDPa+e0qXygV2mjaHsuN9" ip_address: "176.53.69.22" port: 4422 elk: domain_full: elk.dev.bitmask.net domain_internal: elk.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAQhe04n0cSyx0VXXZnYiYPA1+1jOVmNV9u+sf2T0zhOrWIuX0i9+anzwtKdGaIu659Sus59EoyHYioHXfd7KPT/k0HupHu8K68J6L3pS8Jsdbpf8Ud76FcxJRqB9VbjFJ3GAO+Me7xaIFFtvwyVq2RkGdGaIhwvyq5yodJfPk33GJOxGh9J2I2Gn1xSLROWnz+ve7hrrpoysoGRbrrIMIrvHXH6ncrxKsubr7j5Pc+zQz1JY63A0bNQQSv+mZY2cLR/7vTFWurmlz58hKUfyaC6c6cHska7cuuYdEw//iQxN7v156IudZODhBn71mzfQiXi7Bsa2pfZwKFqctfbsz" - ip_address: "1.209.122.22" - port: 22 + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrcf0LAT87yXYy8D6M2cnn88Cq+sHn+yCc5bApC8eDAsnEhU85AM23uPPlhvrGUlC2sWq5027693OOiUeoWuIv62J0ezggw4m8NLp8Y1zWsx9jS7y3wUHjGmZcB/abWUOLLT9ouQoZeGRqix0jaSkO1VnjRwKzPPhLYhbsxuVVy2hvAWDoV0ufaJi1N+wpqPzDrUa5SrlEyGbhnPiA+AlVU6GyCxB/DV+PiURf+W52dDeiFkOGlPgwu4vzMj1nes6wrQKTguINBw+6tTIF3C6hIqtbIRu+EVV4JFQ/UjuaZ57ubw616R3BC8IJdwSycZ3TFbEDLRpG9AkKS/OBI8OV" + ip_address: "1.209.122.21" + port: 4422 starfish: domain_full: starfish.dev.bitmask.net domain_internal: starfish.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQClQH3zJNBilfI6FeMR9xi3HPZPK0GD0frwJyfAtaCRaWdJAXwO/kjScrOeF+JWgaDL3Ej7nRz3lo2qeQKRhC2HawA+dDSZKbreOg5nghEFT4NY5h8brKLk0/d7+8fUofsyTRrS+gfAauqxiRcmcy8prMiAdLL8SWcb9ylExq9AvxovIJ1CPZ59PL5Hc/REFybnux1y2qdQ0IewZ4DKx16/0NLArIYxNNwRn3qp8Vy1I/2VPpwpeH8kgN+v4/9iL32TM5dLlZ4uKed/WTSKyWalN1HbAGgV5Sx9KXmPoo/0l/CqCAJzLqttACWZbutE+O6fQqYg7o7idhQ6VDE2YKe/" + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCkbUoYD7f7Sbl+ElkJmxopRXh21DhcrVfFqlUwSdSpnAtgTSFRC1JMrDkPdJ69htsYiwoB+Bed0FQyCB4NU0QJbgM73VXJ0SqrpJJKx/7Ry5E8aBukiaAe8k8O6ZbnPeoZx11PwrSlS9Wrh928tuH7/ism7XHytlFYayYywvY2djIy9TbLsuOV6EQmVAVONhRVet4iOiFqfFDplRjttFVMJROO8W51YDdcTEwR+gLwS7yKp3e/XZT1vrHzmKo7j9saEgC0KncJrGDqoZ0Q1U0Did+MmHRQTJ13TcjHDnCiU7nO9w6OgGo4nTzGOJCjJkJm8opCxT3X0jCcHIkmEIU/" ip_address: "176.53.69.23" port: 4422 urchin: domain_full: urchin.dev.bitmask.net domain_internal: urchin.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC5KHWPUGhpPTvgDCyUeg59eYHN6QEPUck37GlKeRod24M2ShqsYB9F2Awg8fUEJSDjufJFhpSnafTfNQ5Da++jsCqb+EfSkBd7PKxI2ny5N5RkNnSNTPhKAKehLWqGhNZ6ClpCHpvxkx0peRgOt5Y3etWEcA/cG9MdIALPcugegsCym+UzepyYH8omBBBIVqaMPzhkz8xRnsun1cNshi0M7IgSVcPOZx4Fc2LFqs8hdTXrrMRJPsa3MMaRmNzyVAM7pPomvF0Lp1ZOwQxEwkvF8pa90ioYP63RzwcV9eveKMQXNfIVjcMnOCL7M1IAToYj0jgw6SN7TZfdFqCIEOV7" + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDkcNk748DAajCK3W99eLrc15nRGFeeEH4YLbsVd4gwNLzKsmVdm2oOAXl6Qb9nW2FIwsl37LR5dB/AU7lWQVICQ4CSdy9pwoWh6rd4tbobyMaQLDtx/oUXJlYBy7KBInSMxIPs2MRe9SG3BfhWvuj1m+bBSfqRQVj3YeE1M3pTMNHrYjDcdXusGITAxqNYDtN3+d4npVClavO5MuxQ4yr/vS8ibfvO21PMp2Sa9JtTXNX2Y1fF3xq0XT5UZd8YhnN/WWIaAxtkp3WMFLTOkFYTo+T3/C0Gsx6v+xCjKyytviquOJeLVJQ5ofP2RC0cSYdJJA1gs8bgUce3Sdp1+iij" ip_address: "176.53.69.21" port: 4422 -ip_address: "1.209.122.22" +ip_address: "1.209.122.21" location: - country_code: TR + country_code: KR hemisphere: "N" - name: Istanbul - timezone: "+2" + name: Seoul + timezone: "+9" mail: smarthost: - starfish.dev.bitmask.net name: elk platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" service_type: internal_service services: - couchdb -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git ssh: authorized_keys: azul: @@ -157,7 +136,7 @@ ssh: mosh: enabled: true ports: "60000:61000" - port: 22 + port: 4422 stunnel: clients: ednp_clients: @@ -194,7 +173,7 @@ stunnel: connect_port: 4369 tags: - development - - istanbul + - seoul x509: ca_cert: | -----BEGIN CERTIFICATE----- diff --git a/hiera/frog.yaml b/hiera/frog.yaml index 37087e6..c09b1fa 100644 --- a/hiera/frog.yaml +++ b/hiera/frog.yaml @@ -20,36 +20,11 @@ mail: smarthost: [] name: frog platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" service_type: public_service services: - static -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git ssh: authorized_keys: azul: @@ -90,7 +65,7 @@ static: bootstrap_files: client_version: max: ~ - min: "0.7" + min: "0.5" domain: bitmask.net enabled: true provider_json: ~ diff --git a/hiera/gorilla.yaml b/hiera/gorilla.yaml index 6d8478f..338b637 100644 --- a/hiera/gorilla.yaml +++ b/hiera/gorilla.yaml @@ -5,7 +5,6 @@ apt: basic: "http://ftp.daum.net/debian/" contacts: - sysdev@leap.se - - varac@leap.se couch: bigcouch: cookie: A7MD6YCHa9yBbxRGxkcy8VuxWafBmwgB @@ -84,35 +83,10 @@ mail: name: gorilla platform: major_version: "0.6" - version: "0.6.1" + version: "0.6" service_type: internal_service services: - couchdb -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.6.1 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.6 - source: "https://leap.se/git/leap_web" - type: git ssh: authorized_keys: azul: diff --git a/hiera/hippo.yaml b/hiera/hippo.yaml index 1eb6225..d853cfa 100644 --- a/hiera/hippo.yaml +++ b/hiera/hippo.yaml @@ -53,35 +53,10 @@ openvpn: user_ips: false platform: major_version: "0.6" - version: "0.6.1" + version: "0.6" service_type: user_service services: - openvpn -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.6.1 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.6 - source: "https://leap.se/git/leap_web" - type: git ssh: authorized_keys: azul: diff --git a/hiera/koala.yaml b/hiera/koala.yaml index fafbc01..4dfbd28 100644 --- a/hiera/koala.yaml +++ b/hiera/koala.yaml @@ -84,36 +84,11 @@ mail: - octopus.unstable.bitmask.net name: koala platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" service_type: internal_service services: - couchdb -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git ssh: authorized_keys: azul: diff --git a/hiera/ladybug.yaml b/hiera/ladybug.yaml index c631da5..60fdce7 100644 --- a/hiera/ladybug.yaml +++ b/hiera/ladybug.yaml @@ -26,36 +26,11 @@ mail: - starfish.dev.bitmask.net name: ladybug platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" service_type: internal_service services: - backup -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git ssh: authorized_keys: azul: diff --git a/hiera/leech.yaml b/hiera/leech.yaml index baa4ec7..75519a9 100644 --- a/hiera/leech.yaml +++ b/hiera/leech.yaml @@ -62,7 +62,7 @@ location: mail: smarthost: [] mynetworks: - - "1.209.122.22" + - "1.209.122.21" - "1.209.122.24" - "1.209.122.26" - "176.53.69.13" @@ -100,36 +100,11 @@ mynetworks: - "85.17.92.143" name: leech platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" service_type: user_service services: - mx -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git ssh: authorized_keys: azul: diff --git a/hiera/millipede.yaml b/hiera/millipede.yaml index 131989d..89ecaed 100644 --- a/hiera/millipede.yaml +++ b/hiera/millipede.yaml @@ -54,36 +54,11 @@ openvpn: unlimited_prefix: UNLIMITED user_ips: false platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" service_type: user_service services: - openvpn -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git ssh: authorized_keys: azul: diff --git a/hiera/monitor1.yaml b/hiera/monitor1.yaml index cb03ddb..7a6beee 100644 --- a/hiera/monitor1.yaml +++ b/hiera/monitor1.yaml @@ -144,36 +144,11 @@ nagios: nagiosadmin_pw: Y_uRtQby7LtwXxFRhIv_qVVrwWHzYrQq name: monitor1 platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" service_type: internal_service services: - monitor -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git squid_deb_proxy_client: true ssh: authorized_keys: diff --git a/hiera/mx1.yaml b/hiera/mx1.yaml index c40c57e..278fb84 100644 --- a/hiera/mx1.yaml +++ b/hiera/mx1.yaml @@ -54,7 +54,7 @@ location: ~ mail: smarthost: [] mynetworks: - - "1.209.122.22" + - "1.209.122.21" - "1.209.122.24" - "1.209.122.26" - "176.53.69.13" @@ -92,36 +92,11 @@ mynetworks: - "85.17.92.143" name: mx1 platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" service_type: user_service services: - mx -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git squid_deb_proxy_client: true ssh: authorized_keys: diff --git a/hiera/octopus.yaml b/hiera/octopus.yaml index 6b82302..0ad94ed 100644 --- a/hiera/octopus.yaml +++ b/hiera/octopus.yaml @@ -61,7 +61,7 @@ location: mail: smarthost: [] mynetworks: - - "1.209.122.22" + - "1.209.122.21" - "1.209.122.24" - "1.209.122.26" - "176.53.69.13" @@ -99,36 +99,11 @@ mynetworks: - "85.17.92.143" name: octopus platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" service_type: user_service services: - mx -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git ssh: authorized_keys: azul: diff --git a/hiera/otter.yaml b/hiera/otter.yaml index c7ff3ca..53f937e 100644 --- a/hiera/otter.yaml +++ b/hiera/otter.yaml @@ -54,37 +54,12 @@ openvpn: unlimited_prefix: UNLIMITED user_ips: false platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" service_type: user_service services: - openvpn - tor -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git ssh: authorized_keys: azul: diff --git a/hiera/panda.yaml b/hiera/panda.yaml index 60c034a..8ac0249 100644 --- a/hiera/panda.yaml +++ b/hiera/panda.yaml @@ -85,8 +85,8 @@ mail: - octopus.unstable.bitmask.net name: panda platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" service_type: public_service services: - couchdb @@ -98,31 +98,6 @@ soledad: username: soledad port: 2323 require_couchdb: true -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git ssh: authorized_keys: azul: diff --git a/hiera/plain1.yaml b/hiera/plain1.yaml index 525210d..a625d67 100644 --- a/hiera/plain1.yaml +++ b/hiera/plain1.yaml @@ -21,35 +21,10 @@ mail: - mx1.bitmask.net name: plain1 platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" service_type: internal_service services: [] -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git squid_deb_proxy_client: true ssh: authorized_keys: diff --git a/hiera/seahorse.yaml b/hiera/seahorse.yaml index 81d81a6..d6ee465 100644 --- a/hiera/seahorse.yaml +++ b/hiera/seahorse.yaml @@ -53,36 +53,11 @@ openvpn: unlimited_prefix: UNLIMITED user_ips: false platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" service_type: user_service services: - openvpn -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git ssh: authorized_keys: azul: diff --git a/hiera/snail.yaml b/hiera/snail.yaml index 9d73035..05d0eeb 100644 --- a/hiera/snail.yaml +++ b/hiera/snail.yaml @@ -55,36 +55,11 @@ openvpn: unlimited_prefix: UNLIMITED user_ips: false platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" service_type: user_service services: - openvpn -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git ssh: authorized_keys: azul: diff --git a/hiera/starfish.yaml b/hiera/starfish.yaml index 9f3d46a..629c7a1 100644 --- a/hiera/starfish.yaml +++ b/hiera/starfish.yaml @@ -29,10 +29,10 @@ haproxy: weight: 100 writable: true elk: - backup: false + backup: true host: localhost port: 4001 - weight: 100 + weight: 10 writable: true urchin: backup: false @@ -44,25 +44,25 @@ hosts: clam: domain_full: clam.dev.bitmask.net domain_internal: clam.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCajNm7/fQTZGrPHlAQvViRyJNw0VUYfY8O7BAQxEPsBkyShRoSLm/naDn62TNrj8+Qp0P9A3JJAFmHz3R26Qy2EibBVHzSPhPbNfC2tVCjT8nnvPQFdu2ZAnCG2VCdm/RmLrTXyAApkHXebD37GhTYOAaP2om3jV6KJpKnwYh4g7qPwC/o1h5O5F9HJKRV/aa32mwmxk7bttisDSru1AN/Ag2GibE7z6+HINKAhC4Ptyf0LReKShbPmrULHxfNXXlqNix280NeY/bqsWl03HAmttyRATXA+Repp92CLq24wJC5rBUw/1G8mGCz7HlmRiH72WeuA6mRZrrRoNODiAF" + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqXPBidNRThgSRlEeKFuLxnGf/kmkaHoBimkZRrN7kxhGAwYSrf5mtUGqVFWGcWMPYhqU1uGkZnCgQWV9d60OmWNIZNqsq5Rs343PGKW9S3LrnAa0yFZKLRtESCh53taxF+uJ/vcV76oai+I7b2EZOVtUP6F+iSb3/D+piAcL+p284KkKywsj9FREoh+dpMHthSb7bQDSKqq9UZJVEDQev1tjT7FHnbIY0QJLcYBtYbj945G63UYPQbHVxkl2GCaTXLKaC5CfLRH6cHvwLS3HtyCFEgo9fw0BqztN+Q50+YiQYlKmY6DEnMxwyB7/CjzBcDPa+e0qXygV2mjaHsuN9" ip_address: "176.53.69.22" port: 4422 elk: domain_full: elk.dev.bitmask.net domain_internal: elk.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAQhe04n0cSyx0VXXZnYiYPA1+1jOVmNV9u+sf2T0zhOrWIuX0i9+anzwtKdGaIu659Sus59EoyHYioHXfd7KPT/k0HupHu8K68J6L3pS8Jsdbpf8Ud76FcxJRqB9VbjFJ3GAO+Me7xaIFFtvwyVq2RkGdGaIhwvyq5yodJfPk33GJOxGh9J2I2Gn1xSLROWnz+ve7hrrpoysoGRbrrIMIrvHXH6ncrxKsubr7j5Pc+zQz1JY63A0bNQQSv+mZY2cLR/7vTFWurmlz58hKUfyaC6c6cHska7cuuYdEw//iQxN7v156IudZODhBn71mzfQiXi7Bsa2pfZwKFqctfbsz" - ip_address: "1.209.122.22" - port: 22 + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrcf0LAT87yXYy8D6M2cnn88Cq+sHn+yCc5bApC8eDAsnEhU85AM23uPPlhvrGUlC2sWq5027693OOiUeoWuIv62J0ezggw4m8NLp8Y1zWsx9jS7y3wUHjGmZcB/abWUOLLT9ouQoZeGRqix0jaSkO1VnjRwKzPPhLYhbsxuVVy2hvAWDoV0ufaJi1N+wpqPzDrUa5SrlEyGbhnPiA+AlVU6GyCxB/DV+PiURf+W52dDeiFkOGlPgwu4vzMj1nes6wrQKTguINBw+6tTIF3C6hIqtbIRu+EVV4JFQ/UjuaZ57ubw616R3BC8IJdwSycZ3TFbEDLRpG9AkKS/OBI8OV" + ip_address: "1.209.122.21" + port: 4422 starfish: domain_full: starfish.dev.bitmask.net domain_internal: starfish.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQClQH3zJNBilfI6FeMR9xi3HPZPK0GD0frwJyfAtaCRaWdJAXwO/kjScrOeF+JWgaDL3Ej7nRz3lo2qeQKRhC2HawA+dDSZKbreOg5nghEFT4NY5h8brKLk0/d7+8fUofsyTRrS+gfAauqxiRcmcy8prMiAdLL8SWcb9ylExq9AvxovIJ1CPZ59PL5Hc/REFybnux1y2qdQ0IewZ4DKx16/0NLArIYxNNwRn3qp8Vy1I/2VPpwpeH8kgN+v4/9iL32TM5dLlZ4uKed/WTSKyWalN1HbAGgV5Sx9KXmPoo/0l/CqCAJzLqttACWZbutE+O6fQqYg7o7idhQ6VDE2YKe/" + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCkbUoYD7f7Sbl+ElkJmxopRXh21DhcrVfFqlUwSdSpnAtgTSFRC1JMrDkPdJ69htsYiwoB+Bed0FQyCB4NU0QJbgM73VXJ0SqrpJJKx/7Ry5E8aBukiaAe8k8O6ZbnPeoZx11PwrSlS9Wrh928tuH7/ism7XHytlFYayYywvY2djIy9TbLsuOV6EQmVAVONhRVet4iOiFqfFDplRjttFVMJROO8W51YDdcTEwR+gLwS7yKp3e/XZT1vrHzmKo7j9saEgC0KncJrGDqoZ0Q1U0Did+MmHRQTJ13TcjHDnCiU7nO9w6OgGo4nTzGOJCjJkJm8opCxT3X0jCcHIkmEIU/" ip_address: "176.53.69.23" port: 4422 urchin: domain_full: urchin.dev.bitmask.net domain_internal: urchin.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC5KHWPUGhpPTvgDCyUeg59eYHN6QEPUck37GlKeRod24M2ShqsYB9F2Awg8fUEJSDjufJFhpSnafTfNQ5Da++jsCqb+EfSkBd7PKxI2ny5N5RkNnSNTPhKAKehLWqGhNZ6ClpCHpvxkx0peRgOt5Y3etWEcA/cG9MdIALPcugegsCym+UzepyYH8omBBBIVqaMPzhkz8xRnsun1cNshi0M7IgSVcPOZx4Fc2LFqs8hdTXrrMRJPsa3MMaRmNzyVAM7pPomvF0Lp1ZOwQxEwkvF8pa90ioYP63RzwcV9eveKMQXNfIVjcMnOCL7M1IAToYj0jgw6SN7TZfdFqCIEOV7" + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDkcNk748DAajCK3W99eLrc15nRGFeeEH4YLbsVd4gwNLzKsmVdm2oOAXl6Qb9nW2FIwsl37LR5dB/AU7lWQVICQ4CSdy9pwoWh6rd4tbobyMaQLDtx/oUXJlYBy7KBInSMxIPs2MRe9SG3BfhWvuj1m+bBSfqRQVj3YeE1M3pTMNHrYjDcdXusGITAxqNYDtN3+d4npVClavO5MuxQ4yr/vS8ibfvO21PMp2Sa9JtTXNX2Y1fF3xq0XT5UZd8YhnN/WWIaAxtkp3WMFLTOkFYTo+T3/C0Gsx6v+xCjKyytviquOJeLVJQ5ofP2RC0cSYdJJA1gs8bgUce3Sdp1+iij" ip_address: "176.53.69.21" port: 4422 ip_address: "176.53.69.23" @@ -74,7 +74,7 @@ location: mail: smarthost: [] mynetworks: - - "1.209.122.22" + - "1.209.122.21" - "1.209.122.24" - "1.209.122.26" - "176.53.69.13" @@ -112,36 +112,11 @@ mynetworks: - "85.17.92.143" name: starfish platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" service_type: user_service services: - mx -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git ssh: authorized_keys: azul: diff --git a/hiera/thrips.yaml b/hiera/thrips.yaml index dd0be4a..5e707f6 100644 --- a/hiera/thrips.yaml +++ b/hiera/thrips.yaml @@ -86,8 +86,8 @@ mail: - leech.demo.bitmask.net name: thrips platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" service_type: public_service services: - couchdb @@ -99,31 +99,6 @@ soledad: username: soledad port: 2323 require_couchdb: true -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git ssh: authorized_keys: azul: diff --git a/hiera/tor1.yaml b/hiera/tor1.yaml index e58dd25..e0f07d1 100644 --- a/hiera/tor1.yaml +++ b/hiera/tor1.yaml @@ -21,36 +21,11 @@ mail: - mx1.bitmask.net name: tor1 platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" service_type: internal_service services: - tor -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git squid_deb_proxy_client: true ssh: authorized_keys: diff --git a/hiera/urchin.yaml b/hiera/urchin.yaml index 596d634..88d555e 100644 --- a/hiera/urchin.yaml +++ b/hiera/urchin.yaml @@ -61,25 +61,25 @@ hosts: clam: domain_full: clam.dev.bitmask.net domain_internal: clam.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDCajNm7/fQTZGrPHlAQvViRyJNw0VUYfY8O7BAQxEPsBkyShRoSLm/naDn62TNrj8+Qp0P9A3JJAFmHz3R26Qy2EibBVHzSPhPbNfC2tVCjT8nnvPQFdu2ZAnCG2VCdm/RmLrTXyAApkHXebD37GhTYOAaP2om3jV6KJpKnwYh4g7qPwC/o1h5O5F9HJKRV/aa32mwmxk7bttisDSru1AN/Ag2GibE7z6+HINKAhC4Ptyf0LReKShbPmrULHxfNXXlqNix280NeY/bqsWl03HAmttyRATXA+Repp92CLq24wJC5rBUw/1G8mGCz7HlmRiH72WeuA6mRZrrRoNODiAF" + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqXPBidNRThgSRlEeKFuLxnGf/kmkaHoBimkZRrN7kxhGAwYSrf5mtUGqVFWGcWMPYhqU1uGkZnCgQWV9d60OmWNIZNqsq5Rs343PGKW9S3LrnAa0yFZKLRtESCh53taxF+uJ/vcV76oai+I7b2EZOVtUP6F+iSb3/D+piAcL+p284KkKywsj9FREoh+dpMHthSb7bQDSKqq9UZJVEDQev1tjT7FHnbIY0QJLcYBtYbj945G63UYPQbHVxkl2GCaTXLKaC5CfLRH6cHvwLS3HtyCFEgo9fw0BqztN+Q50+YiQYlKmY6DEnMxwyB7/CjzBcDPa+e0qXygV2mjaHsuN9" ip_address: "176.53.69.22" port: 4422 elk: domain_full: elk.dev.bitmask.net domain_internal: elk.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAQhe04n0cSyx0VXXZnYiYPA1+1jOVmNV9u+sf2T0zhOrWIuX0i9+anzwtKdGaIu659Sus59EoyHYioHXfd7KPT/k0HupHu8K68J6L3pS8Jsdbpf8Ud76FcxJRqB9VbjFJ3GAO+Me7xaIFFtvwyVq2RkGdGaIhwvyq5yodJfPk33GJOxGh9J2I2Gn1xSLROWnz+ve7hrrpoysoGRbrrIMIrvHXH6ncrxKsubr7j5Pc+zQz1JY63A0bNQQSv+mZY2cLR/7vTFWurmlz58hKUfyaC6c6cHska7cuuYdEw//iQxN7v156IudZODhBn71mzfQiXi7Bsa2pfZwKFqctfbsz" - ip_address: "1.209.122.22" - port: 22 + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrcf0LAT87yXYy8D6M2cnn88Cq+sHn+yCc5bApC8eDAsnEhU85AM23uPPlhvrGUlC2sWq5027693OOiUeoWuIv62J0ezggw4m8NLp8Y1zWsx9jS7y3wUHjGmZcB/abWUOLLT9ouQoZeGRqix0jaSkO1VnjRwKzPPhLYhbsxuVVy2hvAWDoV0ufaJi1N+wpqPzDrUa5SrlEyGbhnPiA+AlVU6GyCxB/DV+PiURf+W52dDeiFkOGlPgwu4vzMj1nes6wrQKTguINBw+6tTIF3C6hIqtbIRu+EVV4JFQ/UjuaZ57ubw616R3BC8IJdwSycZ3TFbEDLRpG9AkKS/OBI8OV" + ip_address: "1.209.122.21" + port: 4422 starfish: domain_full: starfish.dev.bitmask.net domain_internal: starfish.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQClQH3zJNBilfI6FeMR9xi3HPZPK0GD0frwJyfAtaCRaWdJAXwO/kjScrOeF+JWgaDL3Ej7nRz3lo2qeQKRhC2HawA+dDSZKbreOg5nghEFT4NY5h8brKLk0/d7+8fUofsyTRrS+gfAauqxiRcmcy8prMiAdLL8SWcb9ylExq9AvxovIJ1CPZ59PL5Hc/REFybnux1y2qdQ0IewZ4DKx16/0NLArIYxNNwRn3qp8Vy1I/2VPpwpeH8kgN+v4/9iL32TM5dLlZ4uKed/WTSKyWalN1HbAGgV5Sx9KXmPoo/0l/CqCAJzLqttACWZbutE+O6fQqYg7o7idhQ6VDE2YKe/" + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCkbUoYD7f7Sbl+ElkJmxopRXh21DhcrVfFqlUwSdSpnAtgTSFRC1JMrDkPdJ69htsYiwoB+Bed0FQyCB4NU0QJbgM73VXJ0SqrpJJKx/7Ry5E8aBukiaAe8k8O6ZbnPeoZx11PwrSlS9Wrh928tuH7/ism7XHytlFYayYywvY2djIy9TbLsuOV6EQmVAVONhRVet4iOiFqfFDplRjttFVMJROO8W51YDdcTEwR+gLwS7yKp3e/XZT1vrHzmKo7j9saEgC0KncJrGDqoZ0Q1U0Did+MmHRQTJ13TcjHDnCiU7nO9w6OgGo4nTzGOJCjJkJm8opCxT3X0jCcHIkmEIU/" ip_address: "176.53.69.23" port: 4422 urchin: domain_full: urchin.dev.bitmask.net domain_internal: urchin.dev.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC5KHWPUGhpPTvgDCyUeg59eYHN6QEPUck37GlKeRod24M2ShqsYB9F2Awg8fUEJSDjufJFhpSnafTfNQ5Da++jsCqb+EfSkBd7PKxI2ny5N5RkNnSNTPhKAKehLWqGhNZ6ClpCHpvxkx0peRgOt5Y3etWEcA/cG9MdIALPcugegsCym+UzepyYH8omBBBIVqaMPzhkz8xRnsun1cNshi0M7IgSVcPOZx4Fc2LFqs8hdTXrrMRJPsa3MMaRmNzyVAM7pPomvF0Lp1ZOwQxEwkvF8pa90ioYP63RzwcV9eveKMQXNfIVjcMnOCL7M1IAToYj0jgw6SN7TZfdFqCIEOV7" + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDkcNk748DAajCK3W99eLrc15nRGFeeEH4YLbsVd4gwNLzKsmVdm2oOAXl6Qb9nW2FIwsl37LR5dB/AU7lWQVICQ4CSdy9pwoWh6rd4tbobyMaQLDtx/oUXJlYBy7KBInSMxIPs2MRe9SG3BfhWvuj1m+bBSfqRQVj3YeE1M3pTMNHrYjDcdXusGITAxqNYDtN3+d4npVClavO5MuxQ4yr/vS8ibfvO21PMp2Sa9JtTXNX2Y1fF3xq0XT5UZd8YhnN/WWIaAxtkp3WMFLTOkFYTo+T3/C0Gsx6v+xCjKyytviquOJeLVJQ5ofP2RC0cSYdJJA1gs8bgUce3Sdp1+iij" ip_address: "176.53.69.21" port: 4422 ip_address: "176.53.69.21" @@ -93,8 +93,8 @@ mail: - starfish.dev.bitmask.net name: urchin platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" service_type: public_service services: - couchdb @@ -106,31 +106,6 @@ soledad: username: soledad port: 2323 require_couchdb: true -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git ssh: authorized_keys: azul: diff --git a/hiera/vpn1.yaml b/hiera/vpn1.yaml index 59ea441..5542735 100644 --- a/hiera/vpn1.yaml +++ b/hiera/vpn1.yaml @@ -51,36 +51,11 @@ openvpn: unlimited_prefix: UNLIMITED user_ips: false platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" service_type: user_service services: - openvpn -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git squid_deb_proxy_client: true ssh: authorized_keys: diff --git a/hiera/wallaby.yaml b/hiera/wallaby.yaml index 2296cb2..7d6d845 100644 --- a/hiera/wallaby.yaml +++ b/hiera/wallaby.yaml @@ -228,36 +228,11 @@ nickserver: domain: nicknym.demo.bitmask.net port: 6425 platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" service_type: public_service services: - webapp -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git ssh: authorized_keys: azul: @@ -328,16 +303,12 @@ webapp: client_certificates: bit_size: 2048 digest: SHA256 - life_span: "2 months" + life_span: 2m limited_prefix: LIMITED unlimited_prefix: UNLIMITED client_version: max: ~ - min: "0.7" - couchdb_admin_user: - password: hfY4x7epQ7BrULbZJRgu5KKk4gR_J2AW - salt: e1dca99375c513be477295f141b9f032 - username: admin + min: "0.5" couchdb_webapp_user: password: LH5DH5rbLZs7zuCaIgWpDAetDpLvUAHg salt: c632af58769857bcdf108b46da9eaa44 @@ -358,6 +329,9 @@ webapp: - postmaster - ssladmin - www-data + git: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" modules: - billing - help diff --git a/hiera/web1.yaml b/hiera/web1.yaml index e8ad765..412f6dc 100644 --- a/hiera/web1.yaml +++ b/hiera/web1.yaml @@ -183,36 +183,11 @@ nickserver: domain: nicknym.bitmask.net port: 6425 platform: - major_version: "0.7" - version: "0.7" + major_version: "0.6" + version: "0.6" service_type: public_service services: - webapp -sources: - apt: - backports: "http://http.debian.net/debian/" - basic: "http://http.debian.net/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 - soledad: - package: soledad-server - revision: latest - type: apt - tapicero: - revision: origin/version/0.7 - source: "https://leap.se/git/tapicero" - type: git - webapp: - revision: origin/version/0.7 - source: "https://leap.se/git/leap_web" - type: git squid_deb_proxy_client: true ssh: authorized_keys: @@ -283,16 +258,12 @@ webapp: client_certificates: bit_size: 2048 digest: SHA256 - life_span: "2 months" + life_span: 2m limited_prefix: LIMITED unlimited_prefix: UNLIMITED client_version: max: ~ - min: "0.7" - couchdb_admin_user: - password: _Bn6AqU54shspQxbnsQTpRySjLQKTjBh - salt: 3195fb6efdbf4b4825026116d5aaabfe - username: admin + min: "0.5" couchdb_webapp_user: password: pg9XGGdt4Dr3WcM9PYDqMmxxKHTpvsc9 salt: 7e8868f8c4775290fd37d2f520d13672 @@ -313,6 +284,9 @@ webapp: - postmaster - ssladmin - www-data + git: + revision: origin/version/0.6 + source: "https://leap.se/git/leap_web" modules: - billing - help diff --git a/nodes/elk.json b/nodes/elk.json index d309f45..f71c920 100644 --- a/nodes/elk.json +++ b/nodes/elk.json @@ -1,6 +1,9 @@ { - "ip_address": "1.209.122.20", + "ip_address": "1.209.122.21", "services": "couchdb", + "ssh": { + "port": 4422 + }, "tags": [ "development", "seoul" ], -- cgit v1.2.3