From 1aa30ebde48dff09fc1d7c7971c2873182a2312c Mon Sep 17 00:00:00 2001
From: Nicolas Wavrant <nicolas.wavrant@tiolive.com>
Date: Fri, 22 Aug 2014 04:55:01 +0200
Subject: [PATCH] slaprunner: updated info for git (parameters and readme)
---
software/slaprunner/README.txt | 8 ++++----
software/slaprunner/common.cfg | 2 +-
software/slaprunner/instance-resilient.cfg.jinja2 | 3 ++-
software/slaprunner/instance-runner.cfg | 3 +--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/software/slaprunner/README.txt b/software/slaprunner/README.txt
index d103a8006..a9f0a9736 100644
--- a/software/slaprunner/README.txt
+++ b/software/slaprunner/README.txt
@@ -127,11 +127,11 @@ Example :
Git repositories :
------------------
-It is easy to give access to your git repository/ies to everyone, or to clone it on your own computer. For this, there are 2 urls to remember:
- - For read only, you can clone : https://[IPV6]:PORT/git-public/YourRepo.git/
- - For read and write access, using your runner account : https://[IPV6]:PORT/git/YourRepo.git/
+It is easy to give access to your git repository/ies to everyone, or to clone it on your own computer. For this, fetch the git_url parameter returned by your webrunner instance. It should look like that : https://[IPV6]:PORT/git/YourRepo.git/
-To create the repo, go in the folder srv/runner/project and initiate a new git repo (git init/clone --bare XXX).
+To create the repo, go to the folder srv/runner/project and initiate a new git repo (git init/clone --bare YourRepo). Then, to clone the repo, just append its name to the previous URL.
+
+Please notice that your repositories are in public access for reading. However, an account is needed to push to the repository (use your webrunner account, or create a new user in the parameters section of the webrunner).
For the moment, the PORT is the port of monitoring, which is 9685.
diff --git a/software/slaprunner/common.cfg b/software/slaprunner/common.cfg
index d7403fb7b..0ca630482 100644
--- a/software/slaprunner/common.cfg
+++ b/software/slaprunner/common.cfg
@@ -80,7 +80,7 @@ mode = 0644
[template-resilient]
recipe = slapos.recipe.download
url = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
-md5sum = 1f7332d0b0671929a2de87ef9ce998c8
+md5sum = dae3a29317454443a1ab733830363b0e
filename = instance-resilient.cfg.jinja2
mode = 0644
diff --git a/software/slaprunner/instance-resilient.cfg.jinja2 b/software/slaprunner/instance-resilient.cfg.jinja2
index 07ddb7f3b..2b00727b9 100644
--- a/software/slaprunner/instance-resilient.cfg.jinja2
+++ b/software/slaprunner/instance-resilient.cfg.jinja2
@@ -28,7 +28,7 @@ parts +=
# Bubble up the parameters
[request-runner]
-return = url ssh-public-key ssh-url notification-id ip backend_url url ssh_command access_url 1_info 2_info monitor_url webdav_url public_url
+return = url ssh-public-key ssh-url notification-id ip backend_url url ssh_command access_url 1_info 2_info monitor_url webdav_url public_url git_url
[publish-connection-informations]
recipe = slapos.cookbook:publish
@@ -41,6 +41,7 @@ ssh_command = ${request-runner:connection-ssh_command}
monitor_url = ${request-runner:connection-monitor_url}
webdav_url = ${request-runner:connection-webdav_url}
public_url = ${request-runner:connection-public_url}
+git_url = ${request-runner:connection-git_url}
[slap-parameter]
# Default parameters for distributed deployment
diff --git a/software/slaprunner/instance-runner.cfg b/software/slaprunner/instance-runner.cfg
index 4761dcd98..b8c7339fb 100644
--- a/software/slaprunner/instance-runner.cfg
+++ b/software/slaprunner/instance-runner.cfg
@@ -444,8 +444,7 @@ ssh_command = ssh $${dropbear-runner-server:host} -p $${dropbear-runner-server:p
monitor_url = https://$${monitor-frontend:connection-domain}
webdav_url = $${:monitor_url}/share/
public_url = $${:monitor_url}/public/
-git_public_url = https://[$${httpd-parameters:global_ip}]:$${httpd-parameters:monitor_port}/git-public/
-git_private_url = https://[$${httpd-parameters:global_ip}]:$${httpd-parameters:monitor_port}/git/
+git_url = https://[$${httpd-parameters:global_ip}]:$${httpd-parameters:monitor_port}/git/
#---------------------------
#--
--
2.30.9