From 1da37fd05328976894035176faed6811d003dd4c Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 27 Jan 2015 22:10:06 +0100 Subject: provide apt.url key that can be customized in provider.json Change-Id: Ic8bcca7fde25b4eb540aab8cc4114748b9b2cfd7 --- provider_base/common.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'provider_base/common.json') diff --git a/provider_base/common.json b/provider_base/common.json index 649db0d9..c25f59b4 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -50,5 +50,8 @@ "platform": { "version": "= Leap::Platform.version.to_s", "major_version": "= Leap::Platform.major_version" + }, + "apt": { + "url": "= provider.apt.url" } } -- cgit v1.2.3 From 1b3455a697ae74b34f28f4960bf0a274e27a1ee8 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 27 Jan 2015 22:40:08 +0100 Subject: provide way to customize all three apt sources urls (basic, security, backports) Change-Id: I5542b320bb1edb52c63350b5e4fd2af681991fb5 --- provider_base/common.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'provider_base/common.json') diff --git a/provider_base/common.json b/provider_base/common.json index c25f59b4..cc4d2557 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -52,6 +52,10 @@ "major_version": "= Leap::Platform.major_version" }, "apt": { - "url": "= provider.apt.url" + "url": { + "basic": "= provider.apt.url.basic", + "security": "= provider.apt.url.security", + "backports": "= provider.apt.url.backports" + } } } -- cgit v1.2.3 From aed223ad42635370bdbc1b239ed43a1330698c5e Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 4 Feb 2015 14:03:31 -0800 Subject: consolidate sources into common.json --- provider_base/common.json | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) (limited to 'provider_base/common.json') 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" } } } -- cgit v1.2.3 From 1555cfa158c26ced05300402bbbce08081d62f7b Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 4 Feb 2015 15:42:26 -0800 Subject: upgrade to tapicero 0.6.1, to remove auth in process list (closes #6697) --- provider_base/common.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'provider_base/common.json') diff --git a/provider_base/common.json b/provider_base/common.json index 95ffa8d2..74c09efe 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -75,7 +75,7 @@ "tapicero": { "type": "git", "source": "https://leap.se/git/tapicero", - "revision": "origin/version/0.6" + "revision": "origin/version/0.6.1" }, "webapp": { "type": "git", -- cgit v1.2.3 From 5398a55d0b7b60a321b08454885134e3297311b3 Mon Sep 17 00:00:00 2001 From: elijah Date: Wed, 18 Mar 2015 12:27:26 -0700 Subject: pin webapp to version/0.6.1 --- provider_base/common.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'provider_base/common.json') diff --git a/provider_base/common.json b/provider_base/common.json index 74c09efe..6ad8a2e6 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -80,7 +80,7 @@ "webapp": { "type": "git", "source": "https://leap.se/git/leap_web", - "revision": "origin/version/0.6" + "revision": "origin/version/0.6.1" } } } -- cgit v1.2.3 From 1f3a09047dbc0b411fc78233301f8440957ee6b8 Mon Sep 17 00:00:00 2001 From: elijah Date: Mon, 30 Mar 2015 22:33:39 -0700 Subject: set platform version 0.7 --- provider_base/common.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'provider_base/common.json') diff --git a/provider_base/common.json b/provider_base/common.json index 6ad8a2e6..4a5406a0 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -75,12 +75,12 @@ "tapicero": { "type": "git", "source": "https://leap.se/git/tapicero", - "revision": "origin/version/0.6.1" + "revision": "origin/version/0.7" }, "webapp": { "type": "git", "source": "https://leap.se/git/leap_web", - "revision": "origin/version/0.6.1" + "revision": "origin/version/0.7" } } } -- cgit v1.2.3 From 27833d50d8f26dd23ca7483ae6e6f2f255841454 Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 5 May 2015 15:24:36 -0700 Subject: improved `leap cert csr` error message --- provider_base/common.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'provider_base/common.json') diff --git a/provider_base/common.json b/provider_base/common.json index 4a5406a0..547acc80 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -29,8 +29,8 @@ "cert": "= x509.use ? file(:node_x509_cert, :missing => 'x509 certificate for node $node. Run `leap cert update`') : nil", "key": "= x509.use ? file(:node_x509_key, :missing => 'x509 key for node $node. Run `leap cert update`') : nil", "ca_cert": "= try_file :ca_cert", - "commercial_cert": "= x509.use_commercial ? file([:commercial_cert, try{webapp.domain}||domain.full_suffix], :missing => 'commercial x509 certificate for node $node. Add file $file, or run `leap cert csr` to generate a temporary self-signed cert and CSR you can use to purchase a real cert.') : nil", - "commercial_key": "= x509.use_commercial ? file([:commercial_key, try{webapp.domain}||domain.full_suffix], :missing => 'commercial x509 certificate for node $node. Add file $file, or run `leap cert csr` to generate a temporary self-signed cert and CSR you can use to purchase a real cert.') : nil", + "commercial_cert": "= x509.use_commercial ? file([:commercial_cert, try{webapp.domain}||domain.full_suffix], :missing => 'commercial x509 certificate for node $node. Add file $file, or run `leap cert csr --domain %s` to generate a temporary self-signed cert and CSR you can use to purchase a real cert.' % (try{webapp.domain}||domain.full_suffix)) : nil", + "commercial_key": "= x509.use_commercial ? file([:commercial_key, try{webapp.domain}||domain.full_suffix], :missing => 'commercial x509 certificate for node $node. Add file $file, or run `leap cert csr --domain %s` to generate a temporary self-signed cert and CSR you can use to purchase a real cert.' % (try{webapp.domain}||domain.full_suffix)) : nil", "commercial_ca_cert": "= x509.use_commercial ? try_file(:commercial_ca_cert) : nil" }, "service_type": "internal_service", -- cgit v1.2.3 From 05f4ab41911375ac037cb85bbdb9ad7916f6a4ec Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 5 May 2015 12:08:40 -0400 Subject: Change http.debian.net to now official name: httpredir.debian.org (#6932) Change-Id: I1e411ef3ffa2ef7fdcae90081f530f44023a96b6 --- provider_base/common.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'provider_base/common.json') diff --git a/provider_base/common.json b/provider_base/common.json index 547acc80..c7be5cf4 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -53,9 +53,9 @@ }, "sources": { "apt": { - "basic": "http://http.debian.net/debian/", + "basic": "http://httpredir.debian.org/debian/", "security": "http://security.debian.org/", - "backports": "http://http.debian.net/debian/" + "backports": "http://httpredir.debian.org/debian/" }, "leap-mx": { "type": "apt", -- cgit v1.2.3