commit 8281c7e865cc093ebad01fe06ac07ece98e9ec3b
author Shawn Pearce <sop@google.com> Thu Mar 21 09:31:07 2013 -0700
committer Shawn Pearce <sop@google.com> Thu Mar 21 09:31:07 2013 -0700
tree 15697a9ef8a06b1714785676ceb2b880ff7230a8
parent e1f6f98362d7a1d4c8c51943df32e0ff61e9c22f

init: Always configure gerrit.canonicalWebUrl

Gerrit has been requiring this field for several versions now,
but init did not configure it. Ensure there is a value set so
the server is not confused at runtime.

Change-Id: I72020df3cb7dcc0f7dd417415ca12e9f5dd823ae

gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitHttpd.java

diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitHttpd.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitHttpd.java
index feb00e1..34e6970 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitHttpd.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitHttpd.java
@@ -121,12 +121,7 @@
     } catch (URISyntaxException e) {
       throw die("invalid httpd.listenUrl");
     }
-    if (gerrit.get("canonicalWebUrl") != null //
-        || (!proxy && ssl) //
-        || getAuthType() == AuthType.OPENID) {
-      gerrit.string("Canonical URL", "canonicalWebUrl", uri.toString());
-    }
-
+    gerrit.string("Canonical URL", "canonicalWebUrl", uri.toString());
     generateSslCertificate();
   }