[arch-commits] Commit in couchdb/trunk (PKGBUILD couchdb.default couchdb.service)

[Bruno Pagani]

    Date: Monday, May 9, 2022 @ 12:46:16
  Author: archange
Revision: 1196373

upgpkg: couchdb 3.2.2-2

Follow upstream (https://github.com/apache/couchdb-pkg/pull/92) and specify
ERL_EPMD_ADDRESS=127.0.0.1 by default but allow easy configuration of this
variable. While we are at it, move the other env vars there too.

Added:
  couchdb/trunk/couchdb.default
Modified:
  couchdb/trunk/PKGBUILD
  couchdb/trunk/couchdb.service

-----------------+
 PKGBUILD        |   14 +++++++++-----
 couchdb.default |    3 +++
 couchdb.service |    2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-09 12:43:13 UTC (rev 1196372)
+++ PKGBUILD	2022-05-09 12:46:16 UTC (rev 1196373)
@@ -5,7 +5,7 @@
 
 pkgname=couchdb
 pkgver=3.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Document-oriented database that can be queried and indexed in a MapReduce fashion using JSON"
 arch=(x86_64)
 url="https://couchdb.apache.org"
@@ -14,13 +14,16 @@
 optdepends=('erlang-nox: for weatherreport')
 makedepends=(erlang-nox)
 backup=(etc/couchdb/local.ini
-        etc/couchdb/vm.args)
+        etc/couchdb/vm.args
+        etc/default/couchdb)
 source=("https://archive.apache.org/dist/${pkgname}/source/${pkgver}/apache-${pkgname}-${pkgver}.tar.gz"{,.asc}
+        couchdb.default
         couchdb.service
         couchdb.sysusers
         couchdb.tmpfiles)
 sha256sums=(69c9fd6f80133557f68a02e92dda72a4fd646d646f429f45bb8329a30f82f20e SKIP
-            745754da596c2451352a21ed6e9ade92b2fbd111f9957ddba1209a20bd9eff1d
+            0d21fdd7851b3a6fa099b030cab0e96705b1d5a3a83a4ff1c871814d8742cae9
+            6ab3d362f3fcd9079036c883dc09dc597584cb627831460f2e0c68a31aa052ae
             3ed1ad2a37a068ce194b03fb72eb35285d60fa7faf2d2c2bb710703d229108a8
             7331b9675e3668c5f0d632bee5d154c061cc3e60d451bef3dc0d0ab2dadfa006)
 validpgpkeys=(2EC788AE3F239FA13E82D215CDE711289384AE37  # Joan Touzet (CODE SIGNING KEY) <wohali at apache.org>
@@ -40,13 +43,14 @@
 
 package() {
   cd apache-couchdb-${pkgver}
-  install -dm755 "${pkgdir}"/usr/lib/
-  install -dm755 "${pkgdir}"/etc/couchdb/
+  install -dm755 "${pkgdir}"/usr/lib
+  install -dm755 "${pkgdir}"/etc/couchdb
 
   cp -r rel/couchdb "${pkgdir}"/usr/lib/couchdb
   mv "${pkgdir}"/usr/lib/couchdb/etc/{default.ini,local.ini,vm.args} "${pkgdir}"/etc/couchdb/
 
   cd "${srcdir}"
+  install -Dm644 ${pkgname}.default "${pkgdir}"/etc/default/${pkgname}
   install -Dm644 ${pkgname}.service -t "${pkgdir}"/usr/lib/systemd/system/
   install -Dm644 ${pkgname}.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/${pkgname}.conf
   install -Dm644 ${pkgname}.sysusers "${pkgdir}"/usr/lib/sysusers.d/${pkgname}.conf

Added: couchdb.default
===================================================================
--- couchdb.default	                        (rev 0)
+++ couchdb.default	2022-05-09 12:46:16 UTC (rev 1196373)
@@ -0,0 +1,3 @@
+ERL_EPMD_ADDRESS=127.0.0.1
+COUCHDB_ARGS_FILE=/etc/couchdb/vm.args
+COUCHDB_INI_FILES=/etc/couchdb/default.ini /etc/couchdb/local.ini

Modified: couchdb.service
===================================================================
--- couchdb.service	2022-05-09 12:43:13 UTC (rev 1196372)
+++ couchdb.service	2022-05-09 12:46:16 UTC (rev 1196373)
@@ -7,7 +7,7 @@
 Type=simple
 WorkingDirectory=~
 StateDirectory=couchdb
-Environment=COUCHDB_ARGS_FILE=/etc/couchdb/vm.args "COUCHDB_INI_FILES=/etc/couchdb/default.ini /etc/couchdb/local.ini"
+EnvironmentFile=/etc/default/couchdb
 ExecStart=/usr/lib/couchdb/bin/couchdb
 ReadWritePaths=/etc/couchdb/local.ini
 Restart=always