summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2014-03-24 01:46:22 -0700
committerelijah <elijah@riseup.net>2014-03-24 01:46:22 -0700
commitdd27248d82469ceedbdb44724770d680d9b53033 (patch)
tree7a1fc34929162aac59182234f113855d19eda19b
parent6db0ae36cfefaa5e037eac148fd4f5ceb480a400 (diff)
added frog
-rw-r--r--facts.json4
-rw-r--r--files/ssh/known_hosts1
-rw-r--r--nodes/frog.json38
3 files changed, 43 insertions, 0 deletions
diff --git a/facts.json b/facts.json
index e82bf03..22ec62b 100644
--- a/facts.json
+++ b/facts.json
@@ -11,6 +11,10 @@
"ec2_local_ipv4": "192.168.4.4",
"ec2_public_ipv4": "192.168.5.19"
},
+ "frog": {
+ "ec2_local_ipv4": "192.168.4.12",
+ "ec2_public_ipv4": "192.168.5.23"
+ },
"gadwall": {
"ec2_local_ipv4": "192.168.4.20",
"ec2_public_ipv4": "192.168.5.5"
diff --git a/files/ssh/known_hosts b/files/ssh/known_hosts
index 2e33f05..c20857e 100644
--- a/files/ssh/known_hosts
+++ b/files/ssh/known_hosts
@@ -10,6 +10,7 @@ clam,clam.dev.bitmask.i,clam.dev.bitmask.net,176.53.69.22 ecdsa-sha2-nistp256 AA
demodex,demodex.dev.bitmask.i,demodex.dev.bitmask.net,204.13.164.171 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMux0p9GOVwCFj7T2Kh0whLPz3c8v8mL/6i6+GejvPcM89+I/ahVzDFExxMzlmFwz+yZ95ygROXRkzKYUSpMdGM=
elephant,elephant.dev.bitmask.i,elephant.dev.bitmask.net,176.53.69.13 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCEii+Rann5cu45nG+Ko4Qrpq2jqpLniqMtetk0E2dJaP5TEtEw8jb4AO9dWxQMWY6vP60ref6Lzkk4ZLB8do3I=
elk,elk.dev.bitmask.i,elk.dev.bitmask.net,176.53.69.127 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPdA5B3ZqPDl9Yk7gWHp6oIDjDK30KaZG8i3wyXObgHuSgNDmcScmaUoCSz7Fe6NiQG3WZpghWPxOWiylRjZtew=
+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=
hippo,hippo.demo.bitmask.i,hippo.demo.bitmask.net,85.17.92.143 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBL4iit51nt0P5yulG9s5iNP94MVGOXZTbPeHbnIqXmiYv8u5Cq8l/R4S9T8s9oh8PdZvGfWrbxewz3CaHgIvtbc=
ladybug,ladybug.dev.bitmask.i,ladybug.dev.bitmask.net,199.119.112.8 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIMGrmcqzAv5FRqx0apnBLJtM2dq9fYjPHTUx+Gr+E8zAbEZAKj9bK2/gh6Up5pYKHanOjxygEC2QjaoMk5D0SE=
diff --git a/nodes/frog.json b/nodes/frog.json
new file mode 100644
index 0000000..5795bee
--- /dev/null
+++ b/nodes/frog.json
@@ -0,0 +1,38 @@
+{
+ "ip_address": "199.119.112.23",
+ "services": ["static"],
+ "tags": ["production"],
+ "ssh":{
+ "port": 22
+ },
+ "static": {
+ "domains":{
+ "bitmask.net": {
+ "tls_only": true,
+ "locations": {
+ "front": {
+ "path": "/",
+ "format": "amber",
+ "source": {
+ "type": "git",
+ "repo": "https://leap.se/git/bitmask_net",
+ "revision": "origin/master"
+ }
+ },
+ "help": {
+ "path": "/help",
+ "format": "amber",
+ "source": {
+ "type": "git",
+ "repo": "https://leap.se/git/bitmask_help",
+ "revision": "origin/master"
+ }
+ }
+ },
+ "cert": "= file [:commercial_cert, domain.full_suffix]",
+ "key": "= file [:commercial_key, domain.full_suffix]",
+ "ca_cert": "= try_file :commercial_ca_cert"
+ }
+ }
+ }
+}