summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-04-12 11:22:42 -0700
committerelijah <elijah@riseup.net>2016-04-12 11:22:42 -0700
commitcec451a927405b33fe46142792767e01ddf198c8 (patch)
tree205c074e62ae68f0a00eec36b69b9f14da3efddd
parente9809dc232c86849d8062be1a0dfb406628e70f5 (diff)
recompile
-rw-r--r--hiera/aardwolf.yaml2
-rw-r--r--hiera/alpaca.yaml2
-rw-r--r--hiera/ant.yaml25
-rw-r--r--hiera/cat.yaml2
-rw-r--r--hiera/clam.yaml25
-rw-r--r--hiera/demodex.yaml2
-rw-r--r--hiera/diplocaulus.yaml2
-rw-r--r--hiera/donkey.yaml2
-rw-r--r--hiera/dotterel.yaml2
-rw-r--r--hiera/elephant.yaml2
-rw-r--r--hiera/ferret.yaml2
-rw-r--r--hiera/gecko.yaml2
-rw-r--r--hiera/hippo.yaml2
-rw-r--r--hiera/leech.yaml2
-rw-r--r--hiera/millipede.yaml2
-rw-r--r--hiera/mudskipper.yaml2
-rw-r--r--hiera/otter.yaml2
-rw-r--r--hiera/snail.yaml2
-rw-r--r--hiera/tuatara.yaml2
-rw-r--r--hiera/wallaby.yaml2
20 files changed, 64 insertions, 22 deletions
diff --git a/hiera/aardwolf.yaml b/hiera/aardwolf.yaml
index b503e61..bba13b0 100644
--- a/hiera/aardwolf.yaml
+++ b/hiera/aardwolf.yaml
@@ -105,7 +105,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: origin/master
+ revision: origin/version/0.8
source: "https://leap.se/git/nickserver"
type: git
platform:
diff --git a/hiera/alpaca.yaml b/hiera/alpaca.yaml
index ffbeb23..66c34ac 100644
--- a/hiera/alpaca.yaml
+++ b/hiera/alpaca.yaml
@@ -270,7 +270,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: origin/master
+ revision: origin/version/0.8
source: "https://leap.se/git/nickserver"
type: git
platform:
diff --git a/hiera/ant.yaml b/hiera/ant.yaml
index a56972d..675a846 100644
--- a/hiera/ant.yaml
+++ b/hiera/ant.yaml
@@ -54,7 +54,23 @@ firewall:
port: 4422
to: "198.252.153.82"
stunnel: []
-hosts: {}
+hosts:
+ leech:
+ domain_full: leech.demo.bitmask.net
+ domain_internal: leech.demo.bitmask.i
+ host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxGPMkrINVARV9unydaLMxf16JFa5HWv2OqUXlwRXrhlYP8pBBAEjZaXAi3LMee3byg+NHhofSgRWd76zMW5+vX8HqXVMtCpXRzMk+1EpjA7u8xYW1dWEDMLWCjbB4aB1D1NLTD9u6mn0xJCRIUrqFMrMPyh5xD2M1WPB0lEM7rH79Hm5N4QvKPd0bEFQAYSDlV/hdArp5B1OhQxI8ROu+f6JCA4HEe3+qO8BrtGb4V1dyAdYiViL1IMIYvjQoC0lZm86KAsVDkW8kApYc3js5taSVFYcL58SVcMekjA34klC9pdCxeJNjg9whQP0cAg4/U4C9V8mW/EhzHgXU5FpZ"
+ ip_address: "198.252.153.85"
+ port: 4422
+ wallaby:
+ aliases:
+ - api.demo.bitmask.net
+ - demo.bitmask.net
+ - nicknym.demo.bitmask.net
+ domain_full: wallaby.demo.bitmask.net
+ domain_internal: wallaby.demo.bitmask.i
+ host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP/bJJ5OoSveoTEXAl26Gz0tqJkwzdA2fezMFeyoDDF6BCWntfzFZahoxHWg5alUfNMCJeYYOPYu/k05QzXThkQ="
+ ip_address: "204.13.164.57"
+ port: 4422
ip_address: "198.252.153.82"
location:
country_code: US
@@ -90,7 +106,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: origin/master
+ revision: origin/version/0.8
source: "https://leap.se/git/nickserver"
type: git
platform:
@@ -160,6 +176,11 @@ stunnel:
tags:
- demo
- seattle
+testing:
+ api_hosts:
+ - wallaby.demo.bitmask.net
+ api_uri: "https://api.demo.bitmask.net:4430/1"
+ monitor_auth_token: pvUz85Prt4jXF5aypSaBVeyeHBgHDcj5
x509:
ca_cert: |
-----BEGIN CERTIFICATE-----
diff --git a/hiera/cat.yaml b/hiera/cat.yaml
index a899be7..b36f037 100644
--- a/hiera/cat.yaml
+++ b/hiera/cat.yaml
@@ -120,7 +120,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: origin/master
+ revision: origin/version/0.8
source: "https://leap.se/git/nickserver"
type: git
platform:
diff --git a/hiera/clam.yaml b/hiera/clam.yaml
index 13b1802..59f671e 100644
--- a/hiera/clam.yaml
+++ b/hiera/clam.yaml
@@ -54,7 +54,23 @@ firewall:
port: 4422
to: "176.53.69.22"
stunnel: []
-hosts: {}
+hosts:
+ elephant:
+ aliases:
+ - api.dev.bitmask.net
+ - dev.bitmask.net
+ - nicknym.dev.bitmask.net
+ domain_full: elephant.dev.bitmask.net
+ domain_internal: elephant.dev.bitmask.i
+ host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDbVBsw4Hnwoh1h+/J5NP6Uj6s1ViumP6zeeAtrr/ma/NrvR3x1bXmy/O396zbuFER6a8EyhGwY6WI+vKTjKWMGlOaNyNO7s9CB/keFBx4GGTcx55oHFb/WU0BzFUBoLjfEgelx/03+NIrZyW2XaPYDPdmNOfxMtetBziLugTXsXONIZBD4/QCt+LvbYdjWtziCH/EsdFuetDZ+WZrrUjCHyg2Lm8Xd48U/QrfPUb0oP8QZfoToN5l2Mxx7CnxX1s606zc/kkeaiF6+ATUPJ/6CTTdXZUN3Mg9dFMMyyZLB4TpSX7ldnwE2Wkvc/ngQjS/L8YBoMxsywPw7Q2+rFlV"
+ ip_address: "176.53.69.13"
+ port: 4422
+ snail:
+ domain_full: snail.dev.bitmask.net
+ domain_internal: snail.dev.bitmask.i
+ host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDc9ClDw538Yojfi9WabepcQCdANP8zhF7wExHw3h3VY08CjUfTojZZyYg6EV3X6Itqm73yj6O6+NvWWQ1zXXkCMkyhXmCPJAw/QEcZJLfQUgyv18gLFcLKo7mmhfFtB5+cLVljulwPW0Qd3CKBt/GS7WtBZTQS+mvqQSJliE3k0PBbNaYdJ0fWvfMfz739FCKsvPA0ECAiwluaLx8Mp74l+7azhajvWfXpzNy3NAwx5pdsuE+tCJ4y0bfyzn2ZuykdYrCIzoMlVZOSpELz0RsCXQc7izTJEyfa+046gCovDiDQa+SsBEcAjDEXPLgfK7Fi7TZhs4HMIZuu1Y36zuMD"
+ ip_address: "176.53.69.14"
+ port: 4422
ip_address: "176.53.69.22"
location:
country_code: TR
@@ -90,7 +106,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: origin/master
+ revision: origin/version/0.8
source: "https://leap.se/git/nickserver"
type: git
platform:
@@ -160,6 +176,11 @@ stunnel:
tags:
- development
- istanbul
+testing:
+ api_hosts:
+ - elephant.dev.bitmask.net
+ api_uri: "https://api.dev.bitmask.net:4430/1"
+ monitor_auth_token: QheDQvXkM43jppngAHJzajv3wRdgeLRt
x509:
ca_cert: |
-----BEGIN CERTIFICATE-----
diff --git a/hiera/demodex.yaml b/hiera/demodex.yaml
index 85cdcf4..b121647 100644
--- a/hiera/demodex.yaml
+++ b/hiera/demodex.yaml
@@ -47,7 +47,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: origin/master
+ revision: origin/version/0.8
source: "https://leap.se/git/nickserver"
type: git
platform:
diff --git a/hiera/diplocaulus.yaml b/hiera/diplocaulus.yaml
index dca32de..65342dd 100644
--- a/hiera/diplocaulus.yaml
+++ b/hiera/diplocaulus.yaml
@@ -51,7 +51,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: origin/master
+ revision: origin/version/0.8
source: "https://leap.se/git/nickserver"
type: git
platform:
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index a6d36eb..82ff7fb 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -592,7 +592,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: origin/master
+ revision: origin/version/0.8
source: "https://leap.se/git/nickserver"
type: git
platform:
diff --git a/hiera/dotterel.yaml b/hiera/dotterel.yaml
index fb4aeab..6226927 100644
--- a/hiera/dotterel.yaml
+++ b/hiera/dotterel.yaml
@@ -47,7 +47,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: origin/master
+ revision: origin/version/0.8
source: "https://leap.se/git/nickserver"
type: git
platform:
diff --git a/hiera/elephant.yaml b/hiera/elephant.yaml
index cf401a7..cef14c7 100644
--- a/hiera/elephant.yaml
+++ b/hiera/elephant.yaml
@@ -222,7 +222,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: origin/master
+ revision: origin/version/0.8
source: "https://leap.se/git/nickserver"
type: git
platform:
diff --git a/hiera/ferret.yaml b/hiera/ferret.yaml
index 41ee02a..465d954 100644
--- a/hiera/ferret.yaml
+++ b/hiera/ferret.yaml
@@ -51,7 +51,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: origin/master
+ revision: origin/version/0.8
source: "https://leap.se/git/nickserver"
type: git
platform:
diff --git a/hiera/gecko.yaml b/hiera/gecko.yaml
index 8bc0e94..6d88c89 100644
--- a/hiera/gecko.yaml
+++ b/hiera/gecko.yaml
@@ -104,7 +104,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: origin/master
+ revision: origin/version/0.8
source: "https://leap.se/git/nickserver"
type: git
platform:
diff --git a/hiera/hippo.yaml b/hiera/hippo.yaml
index d1126c2..0f26a20 100644
--- a/hiera/hippo.yaml
+++ b/hiera/hippo.yaml
@@ -79,7 +79,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: origin/master
+ revision: origin/version/0.8
source: "https://leap.se/git/nickserver"
type: git
platform:
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index caf9f46..6912805 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -121,7 +121,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: origin/master
+ revision: origin/version/0.8
source: "https://leap.se/git/nickserver"
type: git
platform:
diff --git a/hiera/millipede.yaml b/hiera/millipede.yaml
index 7cccd41..8e86bb8 100644
--- a/hiera/millipede.yaml
+++ b/hiera/millipede.yaml
@@ -81,7 +81,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: origin/master
+ revision: origin/version/0.8
source: "https://leap.se/git/nickserver"
type: git
platform:
diff --git a/hiera/mudskipper.yaml b/hiera/mudskipper.yaml
index 355842c..57e666a 100644
--- a/hiera/mudskipper.yaml
+++ b/hiera/mudskipper.yaml
@@ -237,7 +237,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: origin/master
+ revision: origin/version/0.8
source: "https://leap.se/git/nickserver"
type: git
platform:
diff --git a/hiera/otter.yaml b/hiera/otter.yaml
index 7db4a63..0545d4d 100644
--- a/hiera/otter.yaml
+++ b/hiera/otter.yaml
@@ -82,7 +82,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: origin/master
+ revision: origin/version/0.8
source: "https://leap.se/git/nickserver"
type: git
platform:
diff --git a/hiera/snail.yaml b/hiera/snail.yaml
index e16d6cf..14f3cfd 100644
--- a/hiera/snail.yaml
+++ b/hiera/snail.yaml
@@ -157,7 +157,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: origin/master
+ revision: origin/version/0.8
source: "https://leap.se/git/nickserver"
type: git
platform:
diff --git a/hiera/tuatara.yaml b/hiera/tuatara.yaml
index 823364b..3b46bed 100644
--- a/hiera/tuatara.yaml
+++ b/hiera/tuatara.yaml
@@ -80,7 +80,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: origin/master
+ revision: origin/version/0.8
source: "https://leap.se/git/nickserver"
type: git
platform:
diff --git a/hiera/wallaby.yaml b/hiera/wallaby.yaml
index 2186549..252710e 100644
--- a/hiera/wallaby.yaml
+++ b/hiera/wallaby.yaml
@@ -251,7 +251,7 @@ sources:
revision: latest
type: apt
nickserver:
- revision: origin/master
+ revision: origin/version/0.8
source: "https://leap.se/git/nickserver"
type: git
platform: