[couchdb-pkg] branch master updated: [deb] remove couchup, update references

[wo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wohali pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git


The following commit(s) were added to refs/heads/master by this push:
     new daf1f62  [deb] remove couchup, update references
daf1f62 is described below

commit daf1f622e273f78c5686fbdc7b8a5cb021b33216
Author: Joan Touzet <wo...@apache.org>
AuthorDate: Thu Jan 30 15:26:31 2020 -0800

    [deb] remove couchup, update references
---
 debian/README.Debian     | 19 ++++++++-----------
 debian/couchdb.postinst  |  1 -
 debian/couchdb.templates |  6 ++++--
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 079f076..e5cf338 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,7 +1,7 @@
-CouchDB 2.0 for Debian
+CouchDB 3.0 for Debian
 ----------------------
 
-CouchDB 2.0 uses an erlang rebar release for installation. This is akin
+CouchDB 3.0 uses an erlang rebar release for installation. This is akin
 to a python virtualenv or a ruby rbenv setup. This relocatable CouchDB
 install contains the Erlang BEAM VM, all support libraries, the CouchDB
 libraries (including any natively-compiled code), couchjs, and so on.
@@ -9,7 +9,7 @@ libraries (including any natively-compiled code), couchjs, and so on.
 Because of this upstream architectural change, it has become impractical
 to install couchdb into the standard /usr hierarchy.
 
-This package installs CouchDB 2.0 into /opt/couchdb, with the following
+This package installs CouchDB 3.0 into /opt/couchdb, with the following
 exceptions:
 
   * Database files are stored and expected in /var/lib/couchdb
@@ -29,13 +29,13 @@ database:
 Logging
 -------
 
-CouchDB 2.0 changed default logging to be stderr only. Unfortunately,
+CouchDB 3.0 changed default logging to be stderr only. Unfortunately,
 currently for Debian and Ubuntu, systemd's journal is not persisted
 to disk, only to a ring buffer in /run. rsyslogd still maintains
 the contents of /var/log.
 
 This package overrides this behaviour and logs to /var/log/couchdb
-as in 1.x.
+as in 1.x and 2.x.
 
 If, in the future, Debian and Ubuntu enable systemd logging via the
 journal, this file will be removed.
@@ -47,7 +47,7 @@ new [log] stanza in local.ini or any local.d/*.ini file.
 Pre-seeding package configuration
 ---------------------------------
 
-The Debian and Ubuntu CouchDB 2.0 packages support pre-seeding answers
+The Debian and Ubuntu CouchDB 3.0 packages support pre-seeding answers
 to configuration questions via debconf-set-selections. This allows
 for unattended, non-interactive ("headless") installation of CouchDB
 while supporting configuration in standalone, clustered or "no-config"
@@ -98,10 +98,7 @@ Upgrading from CouchDB 1.x
 
 The installer attempts to detect if any CouchDB 1.x databases exist
 in /var/lib/couchdb. If so, the installer will warn that manual
-action is required to migrate these databases to CouchDB 2.0, and
-includes instructions on how to perform the migration step.
-
-Migration is accomplished via the /opt/couchdb/bin/couchup tool. Run
-this program to see the invocation parameters and display other help.
+action is required to migrate these databases to CouchDB 3.x. CouchDB
+2.x is required first, or HTTP replication can be performed instead.
 
  -- Joan Touzet <wo...@apache.org>, Thu, 06 Apr 2017 02:50:15 -0400
diff --git a/debian/couchdb.postinst b/debian/couchdb.postinst
index e82b045..b9facfd 100644
--- a/debian/couchdb.postinst
+++ b/debian/couchdb.postinst
@@ -205,7 +205,6 @@ case $1 in
       
     # These should also not be world readable or writable:
     find /opt/couchdb/etc -name *.ini -exec chmod 0640 {} \;
-    chmod a+x /opt/couchdb/bin/couchup
     chmod 0750 /var/log/couchdb
     chmod 0750 /var/lib/couchdb
 
diff --git a/debian/couchdb.templates b/debian/couchdb.templates
index 6fb7cfa..3acdccd 100644
--- a/debian/couchdb.templates
+++ b/debian/couchdb.templates
@@ -92,8 +92,10 @@ Type: note
 _Description: CouchDB 1.x databases found
  During installation, unsharded databases have been detected in the
  /var/lib/couchdb directory. These need migration to be used in
- CouchDB 2.x and forward. Use the `couchup' utility to assist in
- the migration process.
+ CouchDB 3.x. You must first install CouchDB 2.x and use the `couchup'
+ utility to assist in the migration process, then upgrade to 3.x. Or,
+ you can do a clean install of CouchDB 3.x and use replication to
+ migrate your databases directly.
 
 Template: couchdb/postrm_remove_databases
 Type: boolean