diff options
author | elijah <elijah@riseup.net> | 2012-11-27 01:45:35 -0800 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2012-11-27 01:45:35 -0800 |
commit | c7e6b757f888e7de5ad97285cd8d7dc05f8da659 (patch) | |
tree | 76aa2903d6fcf6b7bf2c4929dcfa922772fc8379 /provider | |
parent | 3b8b869bb291ff7a12b53174edbcaa4fcf547c07 (diff) |
recompile with auto-local tag.
Diffstat (limited to 'provider')
-rw-r--r-- | provider/hiera/aligator.yaml | 4 | ||||
-rw-r--r-- | provider/hiera/ca1_vagrant.yaml | 4 | ||||
-rw-r--r-- | provider/hiera/couchdb1_vagrant.yaml | 2 | ||||
-rw-r--r-- | provider/hiera/koala.yaml | 4 | ||||
-rw-r--r-- | provider/hiera/sloth.yaml | 2 | ||||
-rw-r--r-- | provider/hiera/turtle.yaml | 2 | ||||
-rw-r--r-- | provider/hiera/vpn1_vagrant.yaml | 2 | ||||
-rw-r--r-- | provider/hiera/web1_vagrant.yaml | 2 |
8 files changed, 12 insertions, 10 deletions
diff --git a/provider/hiera/aligator.yaml b/provider/hiera/aligator.yaml index 069cdf0..0bd70c2 100644 --- a/provider/hiera/aligator.yaml +++ b/provider/hiera/aligator.yaml @@ -9,7 +9,6 @@ domain: name: aligator.bitmask.net interface: eth0 ip_address: "176.53.69.120" -local: false name: aligator openvpn: adblock: false @@ -44,7 +43,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: production +tags: + - production x509: ca_cert: | -----BEGIN CERTIFICATE----- diff --git a/provider/hiera/ca1_vagrant.yaml b/provider/hiera/ca1_vagrant.yaml index f8415ed..bc219ec 100644 --- a/provider/hiera/ca1_vagrant.yaml +++ b/provider/hiera/ca1_vagrant.yaml @@ -30,7 +30,9 @@ 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: 22 -tags: production +tags: + - production + - local x509: ca_cert: | -----BEGIN CERTIFICATE----- diff --git a/provider/hiera/couchdb1_vagrant.yaml b/provider/hiera/couchdb1_vagrant.yaml index d5cd0ad..3643c24 100644 --- a/provider/hiera/couchdb1_vagrant.yaml +++ b/provider/hiera/couchdb1_vagrant.yaml @@ -40,7 +40,7 @@ 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: - - vagrant + - local x509: ca_cert: | -----BEGIN CERTIFICATE----- diff --git a/provider/hiera/koala.yaml b/provider/hiera/koala.yaml index 4c41160..45f1c6d 100644 --- a/provider/hiera/koala.yaml +++ b/provider/hiera/koala.yaml @@ -9,7 +9,6 @@ domain: name: koala.bitmask.i interface: eth0 ip_address: "176.53.69.125" -local: false name: koala production: true service_type: internal_service @@ -30,7 +29,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: production +tags: + - production x509: ca_cert: | -----BEGIN CERTIFICATE----- diff --git a/provider/hiera/sloth.yaml b/provider/hiera/sloth.yaml index 63e2e6d..e3d2105 100644 --- a/provider/hiera/sloth.yaml +++ b/provider/hiera/sloth.yaml @@ -19,7 +19,6 @@ domain: internal_suffix: bitmask.i name: sloth.bitmask.i ip_address: "176.53.69.122" -local: false name: sloth service_type: internal_service services: @@ -39,6 +38,7 @@ 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: [] x509: ca_cert: | -----BEGIN CERTIFICATE----- diff --git a/provider/hiera/turtle.yaml b/provider/hiera/turtle.yaml index fcbef12..d880f43 100644 --- a/provider/hiera/turtle.yaml +++ b/provider/hiera/turtle.yaml @@ -78,7 +78,6 @@ domain: internal_suffix: bitmask.i name: turtle.bitmask.net ip_address: "176.53.69.119" -local: false name: turtle service_type: public_service services: @@ -98,6 +97,7 @@ 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: 22 +tags: [] webapp: couchdb_hosts: - couchdb1_vagrant.bitmask.i diff --git a/provider/hiera/vpn1_vagrant.yaml b/provider/hiera/vpn1_vagrant.yaml index b25a11c..2e8810c 100644 --- a/provider/hiera/vpn1_vagrant.yaml +++ b/provider/hiera/vpn1_vagrant.yaml @@ -44,7 +44,7 @@ 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: - - vagrant + - local x509: ca_cert: | -----BEGIN CERTIFICATE----- diff --git a/provider/hiera/web1_vagrant.yaml b/provider/hiera/web1_vagrant.yaml index 45fadd1..4a4a382 100644 --- a/provider/hiera/web1_vagrant.yaml +++ b/provider/hiera/web1_vagrant.yaml @@ -99,7 +99,7 @@ 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: - - vagrant + - local webapp: couchdb_hosts: - couchdb1_vagrant.bitmask.i |