From 553a1064a599c7b76b048d654377f500a348574e Mon Sep 17 00:00:00 2001
From: Winston Li <winston.li12@imperial.ac.uk>
Date: Tue, 6 Jan 2015 20:13:05 +0000
Subject: [PATCH] Changed postbackUrl to postbackBaseUrl in config.

---
 services/git-bridge/README.md                                   | 2 +-
 services/git-bridge/bin/config.json                             | 2 +-
 .../git-bridge/src/uk/ac/ic/wlgitbridge/application/Config.java | 2 +-
 .../src/uk/ac/ic/wlgitbridge/application/WLGitBridgeServer.java | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/services/git-bridge/README.md b/services/git-bridge/README.md
index c43a537752..ffbf848a00 100644
--- a/services/git-bridge/README.md
+++ b/services/git-bridge/README.md
@@ -32,7 +32,7 @@ The configuration file is in `.json` format. There is an example at `bin/config.
         "apiBaseUrl" (string): base url for the snapshot api,
         "username" (string, optional): username for http basic auth,
         "password" (string, optional): password for http basic auth,
-        "postbackUrl" (string): the postback url,
+        "postbackBaseUrl" (string): the postback url,
         "serviceName" (string): current name of writeLaTeX in case it ever changes
     }
 
diff --git a/services/git-bridge/bin/config.json b/services/git-bridge/bin/config.json
index 155e00b005..ceec9c2d16 100644
--- a/services/git-bridge/bin/config.json
+++ b/services/git-bridge/bin/config.json
@@ -4,6 +4,6 @@
 	"apiBaseUrl": "https://radiant-wind-3058.herokuapp.com/api/v0",
 	"username": "staging",
 	"password": "6kUfbv0R",
-	"postbackUrl": "http://git.overleaf.com",
+	"postbackBaseUrl": "http://git.overleaf.com",
 	"serviceName": "Overleaf"
 }
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/Config.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/Config.java
index be346c8875..aece3f9bea 100644
--- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/Config.java
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/Config.java
@@ -44,7 +44,7 @@ public class Config implements JSONSource {
         }
         this.apiBaseURL = apiBaseURL;
         serviceName = getElement(configObject, "serviceName").getAsString();
-        postbackURL = getElement(configObject, "postbackUrl").getAsString();
+        postbackURL = getElement(configObject, "postbackBaseUrl").getAsString();
         if (!postbackURL.endsWith("/")) {
             postbackURL += "/";
         }
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/WLGitBridgeServer.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/WLGitBridgeServer.java
index 2f8a9716c1..136ace338b 100644
--- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/WLGitBridgeServer.java
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/WLGitBridgeServer.java
@@ -68,7 +68,7 @@ public class WLGitBridgeServer {
             System.out.println(Util.getServiceName() + "-Git Bridge server started");
             System.out.println("Listening on port: " + port);
             System.out.println("Bridged to: " + writeLatexHostname);
-            System.out.println("Postback URL: " + Util.getPostbackURL());
+            System.out.println("Postback base URL: " + Util.getPostbackURL());
             System.out.println("Root git directory path: " + rootGitDirectoryPath);
         } catch (BindException e) {
             e.printStackTrace();