From 8d611bad9bccd07354599e7e37d6b566d2785881 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 9 Sep 2015 12:19:09 -0700
Subject: move domain definition to provider.env.json, where it makes much more
 sense (also required for platform 0.8, optional for 0.7)

---
 provider.bleeding.json    |  7 ++++---
 provider.clientdev.json   | 19 ++++++++++---------
 provider.demo.json        | 31 ++++++++++++++++---------------
 provider.development.json |  4 +++-
 provider.unstable.json    | 13 +++++++------
 tags/bleeding.json        |  6 +-----
 tags/clientdev.json       |  6 +-----
 tags/demo.json            |  4 ----
 tags/unstable.json        |  6 +-----
 9 files changed, 43 insertions(+), 53 deletions(-)

diff --git a/provider.bleeding.json b/provider.bleeding.json
index aeec189..3637e78 100644
--- a/provider.bleeding.json
+++ b/provider.bleeding.json
@@ -1,5 +1,6 @@
 {
-    "service": {
-        "allow_anonymous": false
-    }
+  "domain": "bleeding.bitmask.net",
+  "service": {
+    "allow_anonymous": false
+  }
 }
diff --git a/provider.clientdev.json b/provider.clientdev.json
index 0bebc7c..979c46f 100644
--- a/provider.clientdev.json
+++ b/provider.clientdev.json
@@ -1,11 +1,12 @@
 {
-    "service": {
-        "allow_anonymous": false
-    },
-    "platform": {
-        "branch": "develop"
-    },
-    "contacts": {
-        "default": "drebs@leap.se"
-    }
+  "domain": "cdev.bitmask.net",
+  //"service": {
+  //    "allow_anonymous": false
+  //},
+  "platform": {
+    "branch": "develop"
+  },
+  "contacts": {
+    "default": "drebs@leap.se"
+  }
 }
diff --git a/provider.demo.json b/provider.demo.json
index 91e7c4c..0ca3e4a 100644
--- a/provider.demo.json
+++ b/provider.demo.json
@@ -1,17 +1,18 @@
 {
-    "description": {
-        "en": "demo.bitmask.net allows you to test the Bitmask application. User accounts may be periodically deleted.",
-        "es": "demo.bitmask.net allows you to test the Bitmask application. User accounts may be periodically deleted.",
-        "el": "demo.bitmask.net allows you to test the Bitmask application. User accounts may be periodically deleted."
-    },
-    "languages": ["en", "pt", "es", "de"],
-    "default_language": "en",
-    "services": ["openvpn"],
-    "service": {
-        "allow_anonymous": true,
-        "levels": {}
-    },
-    "contacts": {
-        "default": "elijah@leap.se"
-    }
+  "domain": "demo.bitmask.net",
+  "description": {
+    "en": "demo.bitmask.net allows you to test the Bitmask application. User accounts may be periodically deleted.",
+    "es": "demo.bitmask.net allows you to test the Bitmask application. User accounts may be periodically deleted.",
+    "el": "demo.bitmask.net allows you to test the Bitmask application. User accounts may be periodically deleted."
+  },
+  "languages": ["en", "pt", "es", "de"],
+  "default_language": "en",
+  "services": ["openvpn"],
+  "service": {
+    "allow_anonymous": true,
+    "levels": {}
+  },
+  "contacts": {
+    "default": "elijah@leap.se"
+  }
 }
diff --git a/provider.development.json b/provider.development.json
index 48e21a6..618ef39 100644
--- a/provider.development.json
+++ b/provider.development.json
@@ -1,6 +1,8 @@
 {
+  "domain": "dev.bitmask.net",
   "service": {
-    "allow_anonymous": false
+    "allow_anonymous": false,
+    "allow_registration": true
   },
   "platform": {
     "branch": "develop"
diff --git a/provider.unstable.json b/provider.unstable.json
index ac6ac8e..ee45c53 100644
--- a/provider.unstable.json
+++ b/provider.unstable.json
@@ -1,8 +1,9 @@
 {
-    "service": {
-        "allow_anonymous": false
-    },
-    "platform": {
-        "branch": "develop"
-    }
+  "domain": "unstable.bitmask.net",
+  "service": {
+    "allow_anonymous": false
+  },
+  "platform": {
+    "branch": "develop"
+  }
 }
diff --git a/tags/bleeding.json b/tags/bleeding.json
index 7c02a20..fc44a81 100644
--- a/tags/bleeding.json
+++ b/tags/bleeding.json
@@ -1,7 +1,3 @@
 {
-  "environment": "bleeding",
-  "domain": {
-     "full_suffix": "= 'bleeding.' + provider.domain",
-     "internal_suffix": "= 'bleeding.' + provider.domain_internal"
-  }
+  "environment": "bleeding"
 }
diff --git a/tags/clientdev.json b/tags/clientdev.json
index e8bad80..84795e3 100644
--- a/tags/clientdev.json
+++ b/tags/clientdev.json
@@ -1,7 +1,3 @@
 {
-  "environment": "clientdev",
-  "domain": {
-     "full_suffix": "= 'cdev.' + provider.domain",
-     "internal_suffix": "= 'cdev.' + provider.domain_internal"
-  }
+  "environment": "clientdev"
 }
\ No newline at end of file
diff --git a/tags/demo.json b/tags/demo.json
index 8fc70e2..1143d15 100644
--- a/tags/demo.json
+++ b/tags/demo.json
@@ -1,9 +1,5 @@
 {
   "environment": "demo",
-  "domain": {
-     "full_suffix": "= 'demo.' + provider.domain",
-     "internal_suffix": "= 'demo.' + provider.domain_internal"
-  },
   "ssh": {
     "port": 4422
   }
diff --git a/tags/unstable.json b/tags/unstable.json
index b3767d9..efc3684 100644
--- a/tags/unstable.json
+++ b/tags/unstable.json
@@ -1,7 +1,3 @@
 {
-  "environment": "unstable",
-  "domain": {
-     "full_suffix": "= 'unstable.' + provider.domain",
-     "internal_suffix": "= 'unstable.' + provider.domain_internal"
-  }
+  "environment": "unstable"
 }
-- 
cgit v1.2.3