summaryrefslogtreecommitdiff
path: root/provider_base
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2015-02-04 14:03:31 -0800
committerelijah <elijah@riseup.net>2015-02-04 14:03:31 -0800
commitaed223ad42635370bdbc1b239ed43a1330698c5e (patch)
tree852d5d4e7d3e24eb8dd064435edf2a8c94feb0f3 /provider_base
parentb76790c6b1a50406b8b576014614d000dc23b6ea (diff)
consolidate sources into common.json
Diffstat (limited to 'provider_base')
-rw-r--r--provider_base/common.json35
-rw-r--r--provider_base/provider.json7
-rw-r--r--provider_base/services/webapp.json4
3 files changed, 30 insertions, 16 deletions
diff --git a/provider_base/common.json b/provider_base/common.json
index cc4d2557..95ffa8d2 100644
--- a/provider_base/common.json
+++ b/provider_base/common.json
@@ -51,11 +51,36 @@
"version": "= Leap::Platform.version.to_s",
"major_version": "= Leap::Platform.major_version"
},
- "apt": {
- "url": {
- "basic": "= provider.apt.url.basic",
- "security": "= provider.apt.url.security",
- "backports": "= provider.apt.url.backports"
+ "sources": {
+ "apt": {
+ "basic": "http://http.debian.net/debian/",
+ "security": "http://security.debian.org/",
+ "backports": "http://http.debian.net/debian/"
+ },
+ "leap-mx": {
+ "type": "apt",
+ "package": "leap-mx",
+ "revision": "latest"
+ },
+ "nickserver": {
+ "type": "git",
+ "source": "https://leap.se/git/nickserver",
+ "revision": "origin/master"
+ },
+ "soledad": {
+ "type": "apt",
+ "package": "soledad-server",
+ "revision": "latest"
+ },
+ "tapicero": {
+ "type": "git",
+ "source": "https://leap.se/git/tapicero",
+ "revision": "origin/version/0.6"
+ },
+ "webapp": {
+ "type": "git",
+ "source": "https://leap.se/git/leap_web",
+ "revision": "origin/version/0.6"
}
}
}
diff --git a/provider_base/provider.json b/provider_base/provider.json
index a60411b1..f8d2715f 100644
--- a/provider_base/provider.json
+++ b/provider_base/provider.json
@@ -59,12 +59,5 @@
"client_version": {
"min": "0.5",
"max": null
- },
- "apt": {
- "url": {
- "basic": "http://http.debian.net/debian/",
- "security": "http://security.debian.org/",
- "backports": "http://http.debian.net/debian/"
- }
}
}
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index 67744f99..e80a758a 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -20,10 +20,6 @@
"secret_token": "= secret :webapp_secret_token",
"api_version": 1,
"secure": false,
- "git": {
- "source": "https://leap.se/git/leap_web",
- "revision": "origin/version/0.6"
- },
"client_version": "= provider.client_version",
"nagios_test_user": {
"username": "nagios_test",