(couchdb-pkg) branch main updated: Sync rpm nouveau java path usage with deb packages

[va...@apache.org]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 0924f18  Sync rpm nouveau java path usage with deb packages
0924f18 is described below

commit 0924f18d8213e3f18bb0695ea22a8debcef351d2
Author: Nick Vatamaniuc <va...@apache.org>
AuthorDate: Wed Sep 18 11:58:49 2024 -0400

    Sync rpm nouveau java path usage with deb packages
    
    The `alternatives` system will switch /usr/bin/java accordingly
    
    Reference: https://github.com/apache/couchdb-pkg/pull/156
---
 rpm/SOURCES/couchdb-nouveau         | 4 ++--
 rpm/SOURCES/couchdb-nouveau.service | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rpm/SOURCES/couchdb-nouveau b/rpm/SOURCES/couchdb-nouveau
index 9702ae9..717cbcc 100644
--- a/rpm/SOURCES/couchdb-nouveau
+++ b/rpm/SOURCES/couchdb-nouveau
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-# alternatives system will automatically switch the /usr/lib/jvm/jre symlink
+# alternatives system will automatically switch the /usr/bin/java
 
-JAVA_HOME="/usr/lib/jvm/jre"
+JAVA_PATH="/usr/bin/java"
 JAVA_OPTS="-server -Djava.awt.headless=true -Xmx2g"
diff --git a/rpm/SOURCES/couchdb-nouveau.service b/rpm/SOURCES/couchdb-nouveau.service
index 429dd4f..6b36c35 100644
--- a/rpm/SOURCES/couchdb-nouveau.service
+++ b/rpm/SOURCES/couchdb-nouveau.service
@@ -5,7 +5,7 @@ After=network-online.target
 
 [Service]
 EnvironmentFile=/etc/sysconfig/couchdb-nouveau
-ExecStart=/bin/sh -c "exec ${JAVA_HOME}/bin/java ${JAVA_OPTS} -jar /opt/couchdb/nouveau/lib/nouveau-*.jar server /opt/couchdb/etc/nouveau.yaml"
+ExecStart=/bin/sh -c "exec ${JAVA_PATH} ${JAVA_OPTS} -jar /opt/couchdb/nouveau/lib/nouveau-*.jar server /opt/couchdb/etc/nouveau.yaml"
 LimitNOFILE=infinity
 Restart=on-failure
 NoNewPrivileges=true