New canonical base url setting for repository urls and notifications

James Moger

2013-11-29 14cbbeaf61ce67c1ef5a6445515f3134dd5690ce

 src/main/java/com/gitblit/servlet/RpcServlet.java

@@ -101,7 +101,10 @@
         result = PROTOCOL_VERSION;

      } else if (RpcRequest.LIST_REPOSITORIES.equals(reqType)) {

         // Determine the Gitblit clone url

         String gitblitUrl = HttpUtils.getGitblitURL(request);

         String gitblitUrl = settings.getString(Keys.web.canonicalUrl, null);

         if (StringUtils.isEmpty(gitblitUrl)) {

            gitblitUrl = HttpUtils.getGitblitURL(request);

         }

         StringBuilder sb = new StringBuilder();

         sb.append(gitblitUrl);

         sb.append(Constants.R_PATH);

@@ -320,7 +323,10 @@
      } else if (RpcRequest.LIST_FEDERATION_SETS.equals(reqType)) {

         // return the list of federation sets

         if (allowAdmin && gitblit.canFederate()) {

            String gitblitUrl = HttpUtils.getGitblitURL(request);

            String gitblitUrl = settings.getString(Keys.web.canonicalUrl, null);

            if (StringUtils.isEmpty(gitblitUrl)) {

               gitblitUrl = HttpUtils.getGitblitURL(request);

            }

            result = gitblit.getFederationSets(gitblitUrl);

         } else {

            response.sendError(notAllowedCode);