You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2025/03/28 17:53:10 UTC
(couchdb-pkg) 01/01: Remove buggy 10-nouveau.ini creation
This is an automated email from the ASF dual-hosted git repository.
rnewson pushed a commit to branch remove-10-nouveauini
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git
commit 300c29ed1031797e91e0282f168d9c20e30076b5
Author: Robert Newson <rn...@apache.org>
AuthorDate: Fri Mar 28 17:50:44 2025 +0000
Remove buggy 10-nouveau.ini creation
In an effort to make nouveau easier to use the couchdb-nouveau package would
attempt to reconfigure couchdb. However this fails if you install couchdb and
couchdb-nouveau at the same time (and doing so is quite normal).
Remove this code. The sysadm can make the single `enable = true` configuration
change themselves.
https://github.com/apache/couchdb-pkg/issues/154
---
debian/couchdb-nouveau.config | 21 ---------------------
debian/couchdb-nouveau.postinst | 13 -------------
debian/couchdb-nouveau.templates | 8 --------
3 files changed, 42 deletions(-)
diff --git a/debian/couchdb-nouveau.config b/debian/couchdb-nouveau.config
deleted file mode 100644
index dd7faad..0000000
--- a/debian/couchdb-nouveau.config
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License. You may obtain a copy of
-# the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations under
-# the License.
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-
-db_input high couchdb-nouveau/enable || true
-db_go
-db_get couchdb-nouveau/enable
diff --git a/debian/couchdb-nouveau.postinst b/debian/couchdb-nouveau.postinst
index dce0d54..d790e64 100644
--- a/debian/couchdb-nouveau.postinst
+++ b/debian/couchdb-nouveau.postinst
@@ -45,19 +45,6 @@ case $1 in
# These should also not be world readable or writable:
chmod 0640 /opt/nouveau/etc/nouveau.yaml
chmod 0750 /var/lib/nouveau
-
- db_input high couchdb-nouveau/enable || true
- db_go || true
- db_get couchdb-nouveau/enable || true
-
- if [ "$RET" = "true" ] && [ -d "/opt/couchdb/etc/default.d" ]; then
- cat <<EOF > /opt/couchdb/etc/default.d/10-nouveau.ini
-[nouveau]
-enable = true
-url = http://127.0.0.1:5987
-EOF
- chown couchdb:couchdb /opt/couchdb/etc/default.d/10-nouveau.ini
- fi
;;
abort-upgrade|abort-remove|abort-configure)
diff --git a/debian/couchdb-nouveau.templates b/debian/couchdb-nouveau.templates
index 4054c32..0f7ebd0 100644
--- a/debian/couchdb-nouveau.templates
+++ b/debian/couchdb-nouveau.templates
@@ -2,14 +2,6 @@
# If you change this file, run debconf-updatepo !
# Failure to do so will result in a rejected pull request.
-Template: couchdb-nouveau/enable
-Type: boolean
-Default: true
-_Description: Enable Nouveau in CouchDB (if installed)?
- Enables nouveau in local CouchDB, if it is installed. You
- will need to reload config or restart CouchDB for the change
- to take effect if it is already running.
-
Template: couchdb-nouveau/postrm_remove_indexes
Type: boolean
Default: false