summaryrefslogtreecommitdiff
path: root/provider/hiera
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2012-11-27 12:28:50 -0800
committerelijah <elijah@riseup.net>2012-11-27 12:28:50 -0800
commitda1cd129155ce3f67ef0ac2c7edaa1e62383e8c3 (patch)
tree19a633f8577b99a22ca1dbe84523cbaf1d9d10ed /provider/hiera
parentc7e6b757f888e7de5ad97285cd8d7dc05f8da659 (diff)
remove 'production' tag from ca1_vagrant, and recompile with updated leap_platform.
Diffstat (limited to 'provider/hiera')
-rw-r--r--provider/hiera/aligator.yaml1
-rw-r--r--provider/hiera/ca1_vagrant.yaml2
-rw-r--r--provider/hiera/koala.yaml1
-rw-r--r--provider/hiera/sloth.yaml5
-rw-r--r--provider/hiera/turtle.yaml2
-rw-r--r--provider/hiera/web1_vagrant.yaml1
6 files changed, 7 insertions, 5 deletions
diff --git a/provider/hiera/aligator.yaml b/provider/hiera/aligator.yaml
index 0bd70c2..0dc3aa0 100644
--- a/provider/hiera/aligator.yaml
+++ b/provider/hiera/aligator.yaml
@@ -9,6 +9,7 @@ domain:
name: aligator.bitmask.net
interface: eth0
ip_address: "176.53.69.120"
+local: false
name: aligator
openvpn:
adblock: false
diff --git a/provider/hiera/ca1_vagrant.yaml b/provider/hiera/ca1_vagrant.yaml
index bc219ec..7c4334a 100644
--- a/provider/hiera/ca1_vagrant.yaml
+++ b/provider/hiera/ca1_vagrant.yaml
@@ -11,7 +11,6 @@ interface: eth0
ip_address: "10.5.5.48"
local: true
name: ca1_vagrant
-production: true
service_type: internal_service
services:
- ca
@@ -31,7 +30,6 @@ ssh:
web1_vagrant,web1_vagrant.bitmask.i,web1_vagrant.bitmask.net,10.5.5.47 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCuaSbZmz9BDotwZZ5X1sKMd3qZd8jdsce5m74x2yOwQvjpvmlK4hM/1NhyGlVcbooiuEOiAU+AWsqLemCJqeGSRvhiFysk4oo1b6qBXjI8+t1mwi0FWgowhVkn3KoQKEhgEEsL60x7olGm+Oo1sTkhDYTKTLs+ERdCMf3M2EpnxTKXh+Eo7t8XjbRbxwnp6EhKrwjKEgKo2Gch4HsEovtD4nbm6hAasembeoTlZs7pm+S6F/+9cRJ9T3iOXkg1DX4KpuzvGK0wULYdOskUQrXPbfhO4TbZJId5P1ECDURF8QuYrQT/eHxKK7hrUVorkgT3WbvT6T4l+m78CITjGG4d
port: 22
tags:
- - production
- local
x509:
ca_cert: |
diff --git a/provider/hiera/koala.yaml b/provider/hiera/koala.yaml
index 45f1c6d..adb9a1e 100644
--- a/provider/hiera/koala.yaml
+++ b/provider/hiera/koala.yaml
@@ -9,6 +9,7 @@ domain:
name: koala.bitmask.i
interface: eth0
ip_address: "176.53.69.125"
+local: false
name: koala
production: true
service_type: internal_service
diff --git a/provider/hiera/sloth.yaml b/provider/hiera/sloth.yaml
index e3d2105..90eaa3b 100644
--- a/provider/hiera/sloth.yaml
+++ b/provider/hiera/sloth.yaml
@@ -19,7 +19,9 @@ domain:
internal_suffix: bitmask.i
name: sloth.bitmask.i
ip_address: "176.53.69.122"
+local: false
name: sloth
+production: true
service_type: internal_service
services:
- couchdb
@@ -38,7 +40,8 @@ ssh:
vpn1_vagrant,vpn1_vagrant.bitmask.i,vpn1_vagrant.bitmask.net,10.5.5.45 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCuaSbZmz9BDotwZZ5X1sKMd3qZd8jdsce5m74x2yOwQvjpvmlK4hM/1NhyGlVcbooiuEOiAU+AWsqLemCJqeGSRvhiFysk4oo1b6qBXjI8+t1mwi0FWgowhVkn3KoQKEhgEEsL60x7olGm+Oo1sTkhDYTKTLs+ERdCMf3M2EpnxTKXh+Eo7t8XjbRbxwnp6EhKrwjKEgKo2Gch4HsEovtD4nbm6hAasembeoTlZs7pm+S6F/+9cRJ9T3iOXkg1DX4KpuzvGK0wULYdOskUQrXPbfhO4TbZJId5P1ECDURF8QuYrQT/eHxKK7hrUVorkgT3WbvT6T4l+m78CITjGG4d
web1_vagrant,web1_vagrant.bitmask.i,web1_vagrant.bitmask.net,10.5.5.47 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCuaSbZmz9BDotwZZ5X1sKMd3qZd8jdsce5m74x2yOwQvjpvmlK4hM/1NhyGlVcbooiuEOiAU+AWsqLemCJqeGSRvhiFysk4oo1b6qBXjI8+t1mwi0FWgowhVkn3KoQKEhgEEsL60x7olGm+Oo1sTkhDYTKTLs+ERdCMf3M2EpnxTKXh+Eo7t8XjbRbxwnp6EhKrwjKEgKo2Gch4HsEovtD4nbm6hAasembeoTlZs7pm+S6F/+9cRJ9T3iOXkg1DX4KpuzvGK0wULYdOskUQrXPbfhO4TbZJId5P1ECDURF8QuYrQT/eHxKK7hrUVorkgT3WbvT6T4l+m78CITjGG4d
port: 4422
-tags: []
+tags:
+ - production
x509:
ca_cert: |
-----BEGIN CERTIFICATE-----
diff --git a/provider/hiera/turtle.yaml b/provider/hiera/turtle.yaml
index d880f43..265a732 100644
--- a/provider/hiera/turtle.yaml
+++ b/provider/hiera/turtle.yaml
@@ -78,6 +78,7 @@ domain:
internal_suffix: bitmask.i
name: turtle.bitmask.net
ip_address: "176.53.69.119"
+local: false
name: turtle
service_type: public_service
services:
@@ -100,7 +101,6 @@ ssh:
tags: []
webapp:
couchdb_hosts:
- - couchdb1_vagrant.bitmask.i
- sloth.bitmask.i
couchdb_user:
password: +vqCKG&7A%wDt&Ka-4=uwn5ZhTt6HVKU
diff --git a/provider/hiera/web1_vagrant.yaml b/provider/hiera/web1_vagrant.yaml
index 4a4a382..a180cd9 100644
--- a/provider/hiera/web1_vagrant.yaml
+++ b/provider/hiera/web1_vagrant.yaml
@@ -103,7 +103,6 @@ tags:
webapp:
couchdb_hosts:
- couchdb1_vagrant.bitmask.i
- - sloth.bitmask.i
couchdb_user:
password: +vqCKG&7A%wDt&Ka-4=uwn5ZhTt6HVKU
username: webapp