diff options
| author | elijah <elijah@riseup.net> | 2015-10-14 13:41:46 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2015-10-14 13:41:46 -0700 |
| commit | db49afbc04bcfa866b402484369a7d846363e31f (patch) | |
| tree | 3b438a25a306104a106670ca5411432c7df47e8a /nodes | |
| parent | ba1a620e64a358cf5a74a5fa09e9e14707f161d9 (diff) | |
| parent | 0453c2f1cf5927a2f5c26f61ca3a4deebf5341f0 (diff) | |
Merge branch 'master' of ssh://leap.se/bitmask
Diffstat (limited to 'nodes')
| -rw-r--r-- | nodes/couch1.json | 7 | ||||
| -rw-r--r-- | nodes/couch2.json | 7 | ||||
| -rw-r--r-- | nodes/mx1.json | 4 | ||||
| -rw-r--r-- | nodes/plain1.json | 3 | ||||
| -rw-r--r-- | nodes/tor1.json | 4 | ||||
| -rw-r--r-- | nodes/vpn1.json | 10 | ||||
| -rw-r--r-- | nodes/web1.json | 4 |
7 files changed, 0 insertions, 39 deletions
diff --git a/nodes/couch1.json b/nodes/couch1.json deleted file mode 100644 index e340357..0000000 --- a/nodes/couch1.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "services": [ - "couchdb", - "soledad" - ], - "ip_address": "10.5.5.44" -} diff --git a/nodes/couch2.json b/nodes/couch2.json deleted file mode 100644 index 83c564d..0000000 --- a/nodes/couch2.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "services": [ - "couchdb", - "soledad" - ], - "ip_address": "10.5.5.52" -} diff --git a/nodes/mx1.json b/nodes/mx1.json deleted file mode 100644 index ffd6149..0000000 --- a/nodes/mx1.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "services": "mx", - "ip_address": "10.5.5.51" -} diff --git a/nodes/plain1.json b/nodes/plain1.json deleted file mode 100644 index b0e3e69..0000000 --- a/nodes/plain1.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "ip_address": "10.5.5.53" -} diff --git a/nodes/tor1.json b/nodes/tor1.json deleted file mode 100644 index 0e97fd9..0000000 --- a/nodes/tor1.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "ip_address": "10.5.5.50", - "services": "tor" -} diff --git a/nodes/vpn1.json b/nodes/vpn1.json deleted file mode 100644 index c6e3932..0000000 --- a/nodes/vpn1.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "services": "openvpn", - "ip_address": "10.5.5.45", - "openvpn": { - "gateway_address": "10.5.5.46", - "free_gateway_address": "10.5.5.47", - "allow_free": true, - "filter_dns": true - } -} diff --git a/nodes/web1.json b/nodes/web1.json deleted file mode 100644 index 0e12ed3..0000000 --- a/nodes/web1.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "services": [ "webapp", "monitor" ], - "ip_address": "10.5.5.47" -} |