summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReyad Attiyat <reyad.attiyat@gmail.com>2017-02-28 08:55:06 -0600
committerDavid Pursehouse <dpursehouse@collab.net>2017-03-01 08:18:24 +0900
commitee59410153b111a5dcd18baf73d3244f4ce3e64e (patch)
tree2082c736544d31489415400287da5dfef9f10680
parent78eca63d8608e1dcd495455f5366b4c544240455 (diff)
Update Documentation of Auto Site Initialization
Since the NotesMigration change, commit 220a3f5, it is no longer possible to configure site_path in the database, with the system_config table, during automatic site initialization. This commit updates the documentation by removing references to this configuration option. Change-Id: I3e4392991fb9d27c5306162353816759d2bbe577
-rw-r--r--Documentation/config-auto-site-initialization.txt28
1 files changed, 4 insertions, 24 deletions
diff --git a/Documentation/config-auto-site-initialization.txt b/Documentation/config-auto-site-initialization.txt
index e55d93ff18..acd03c9c0c 100644
--- a/Documentation/config-auto-site-initialization.txt
+++ b/Documentation/config-auto-site-initialization.txt
@@ -27,18 +27,10 @@ If the `gerrit.site_path` system property is defined then the init is
run for that site. The database connectivity, in that case, is defined
in the `etc/gerrit.config`.
-If `gerrit.site_path` is not defined then Gerrit will try to find an
-existing site by looking into the `system_config` table in the database
-defined via the `jdbc/ReviewDb` JNDI property. If the `system_config`
-table exists then the `site_path` from that table is used for the
-initialization. The database connectivity is defined by the
-`jdbc/ReviewDb` JNDI property.
-
-Finally, if neither the `gerrit.site_path` property nor the
-`system_config` table exists, the `gerrit.init_path` system property,
-if defined, will be used to determine the site path. The database
-connectivity, also for this case, is defined by the `jdbc/ReviewDb`
-JNDI property.
+If `gerrit.site_path` is not defined then Gerrit will try to find the
+`gerrit.init_path` system property. If defined this property will be
+used to determine the site path. The database connectivity, also for
+this case, is defined by the `jdbc/ReviewDb` JNDI property.
[WARNING]
Defining the `jdbc/ReviewDb` JNDI property for an H2 database under the
@@ -70,18 +62,6 @@ database is defined in `etc/gerrit.config` of that site:
=== Example 2
-Prepare Tomcat so that an existing site with the path defined in the
-`system_config` table is initialized (upgraded) on Gerrit startup. The
-assumption is that the `jdbc/ReviewDb` JNDI property is defined in
-Tomcat:
-
-----
- $ export CATALINA_OPTS='-Dgerrit.init'
- $ catalina.sh start
-----
-
-=== Example 3
-
Assuming the database schema doesn't exist in the database defined
via the `jdbc/ReviewDb` JNDI property, initialize a new site using that
database and a given path: