From: Tobias Ulmer <tu@emlix.com>
Date: Fri, 18 Nov 2016 14:30:33 +0000 (+0100)
Subject: e2.conf: clone e2 from git.e2factory.org by default
X-Git-Tag: e2factory-2.3.15rc1~1
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=b8c2ae29d39d110b1a092d3b794538aad7591d58;p=e2factory.git

e2.conf: clone e2 from git.e2factory.org by default

In addition add writeback = true for new-source and create-project.
Remove the comments about ssh/scp, e2 will warn the user against ssh/scp
transport use at runtime.

Signed-off-by: Tobias Ulmer <tu@emlix.com>
---

diff --git a/global/e2.conf.in b/global/e2.conf.in
index 95d7ff2..0293a2f 100644
--- a/global/e2.conf.in
+++ b/global/e2.conf.in
@@ -8,9 +8,9 @@ config {
 		logrotate = 5,
 	},
 	site = {
-		e2_server = "projects",
-		e2_location = "emlix/e2/git/e2factory.git",
-		e2_base = "emlix/e2/git/",
+		e2_server = "e2factory_org",
+		e2_location = "git/e2factory.git",
+		e2_base = "git",
 		e2_branch = "@DEFAULT_LOCAL_BRANCH@",
 		e2_tag = "@DEFAULT_LOCAL_TAG@",
 		default_extensions = {
@@ -30,14 +30,14 @@ config {
 			url = "file://@LOCALSTATEDIR@/upstream",
 			cachable = true,
 			cache = true,
-			-- push_permissions does not work with ssh/scp.
+			writeback = true,
 			push_permissions = "ug+rwX,o-rwX",
 		},
 		projects = {
 			url = "file://@LOCALSTATEDIR@/projects",
 			cachable = true,
 			cache = true,
-			-- push_permissions does not work with ssh/scp.
+			writeback = true,
 			push_permissions = "ug+rwX,o-rwX",
 		},
 		chroot = {
@@ -50,17 +50,18 @@ config {
 			cachable = true,
 			cache = true,
 			writeback = true,
-			-- push_permissions does not work with ssh/scp.
 			push_permissions = "u=rwX,go-rwX",
 		},
 		releases = {
-			url="file://@LOCALSTATEDIR@/releases",
+			url = "file://@LOCALSTATEDIR@/releases",
 			cachable = true,
 			cache = true,
 			writeback = true,
-			-- push_permissions does not work with ssh/scp.
 			push_permissions = "ug+rwX,o-rwX",
 		},
+		e2factory_org = {
+			url = "https://git.e2factory.org",
+		},
 	},
 }