From 360db7b1abf2e59f0735a705041d8379f6226870 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20F=C3=B6rster?= <Dessa@gmake.de>
Date: Thu, 6 Jun 2024 15:20:40 +0200
Subject: [PATCH] [dev-db/mongodb] for 6 migrate socket to /run and change
 logdir creation to tmpfiles

---
 dev-db/mongodb/files/mongodb.conf-r4  | 36 +++++++++++++++++++++++++++
 dev-db/mongodb/files/mongodb.service  | 10 --------
 dev-db/mongodb/files/mongodb.tmpfiles |  2 ++
 dev-db/mongodb/files/mongos.conf-r3   | 32 ++++++++++++++++++++++++
 dev-db/mongodb/mongodb-6.0.15.ebuild  | 13 +++++-----
 5 files changed, 77 insertions(+), 16 deletions(-)
 create mode 100644 dev-db/mongodb/files/mongodb.conf-r4
 delete mode 100644 dev-db/mongodb/files/mongodb.service
 create mode 100644 dev-db/mongodb/files/mongodb.tmpfiles
 create mode 100644 dev-db/mongodb/files/mongos.conf-r3

diff --git a/dev-db/mongodb/files/mongodb.conf-r4 b/dev-db/mongodb/files/mongodb.conf-r4
new file mode 100644
index 0000000..f8b4c96
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb.conf-r4
@@ -0,0 +1,36 @@
+# !! IMPORTANT !!
+#
+# This file uses the YAML format as described in the documentation:
+#   http://docs.mongodb.org/manual/reference/configuration-options/
+
+storage:
+    dbPath: "/var/lib/mongodb"
+    #engine: wiredTiger
+
+systemLog:
+    destination: file
+    path: "/var/log/mongodb/mongodb.log"
+    quiet: true
+    logAppend: true
+
+net:
+    port: 27017
+    bindIp: 127.0.0.1
+    unixDomainSocket:
+        pathPrefix: "/run/mongodb"
+    #ssl:
+    #    mode: disabled
+
+#security:
+    #keyFile:
+    #clusterAuthMode:
+
+#replication:
+    #replSetName:
+
+# Specifies one of the MongoDB parameters described here:
+#   http://docs.mongodb.org/manual/reference/parameters/
+#
+# You can specify multiple setParameter fields such as:
+#   setParameter: {enableTestCommands: 1}
+#setParameter:
diff --git a/dev-db/mongodb/files/mongodb.service b/dev-db/mongodb/files/mongodb.service
deleted file mode 100644
index 78d5511..0000000
--- a/dev-db/mongodb/files/mongodb.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=High-performance, schema-free document-oriented database
-After=network.target
-
-[Service]
-User=mongodb
-ExecStart=/usr/bin/mongod --quiet --config /etc/mongodb.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/dev-db/mongodb/files/mongodb.tmpfiles b/dev-db/mongodb/files/mongodb.tmpfiles
new file mode 100644
index 0000000..021bf2f
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb.tmpfiles
@@ -0,0 +1,2 @@
+d /var/log/mongodb 0750 mongodb mongodb -
+d /run/mongodb 0750 mongodb mongodb -
\ No newline at end of file
diff --git a/dev-db/mongodb/files/mongos.conf-r3 b/dev-db/mongodb/files/mongos.conf-r3
new file mode 100644
index 0000000..e2fd590
--- /dev/null
+++ b/dev-db/mongodb/files/mongos.conf-r3
@@ -0,0 +1,32 @@
+# !! IMPORTANT !!
+#
+# This file uses the YAML format as described in the documentation:
+#   http://docs.mongodb.org/manual/reference/configuration-options/
+
+systemLog:
+    destination: file
+    path: "/var/log/mongodb/mongos.log"
+    quiet: true
+    logAppend: true
+
+net:
+    port: 27017
+    bindIp: 127.0.0.1
+    unixDomainSocket:
+        pathPrefix: "/run/mongodb"
+    ssl:
+        mode: disabled
+
+#security:
+    #keyFile:
+    #clusterAuthMode:
+
+#sharding:
+    #configDB:
+
+# Specifies one of the MongoDB parameters described here:
+#   http://docs.mongodb.org/manual/reference/parameters/
+#
+# You can specify multiple setParameter fields such as:
+#   setParameter: {enableTestCommands: 1}
+#setParameter:
diff --git a/dev-db/mongodb/mongodb-6.0.15.ebuild b/dev-db/mongodb/mongodb-6.0.15.ebuild
index 4252fd0..bee1f9f 100644
--- a/dev-db/mongodb/mongodb-6.0.15.ebuild
+++ b/dev-db/mongodb/mongodb-6.0.15.ebuild
@@ -10,7 +10,7 @@ CHECKREQS_DISK_BUILD="2400M"
 CHECKREQS_DISK_USR="512M"
 CHECKREQS_MEMORY="1024M"
 
-inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd tmpfiles toolchain-funcs
 
 MY_PV=r${PV/_rc/-rc}
 MY_P=mongo-${MY_PV}
@@ -191,22 +191,23 @@ src_install() {
 	newconfd "${FILESDIR}/mongos.confd-r3" mongos
 
 	insinto /etc
-	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
-	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+	newins "${FILESDIR}/${PN}.conf-r4" ${PN}.conf
+	newins "${FILESDIR}/mongos.conf-r3" mongos.conf
 
 	systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
 
+	dotmpfiles "${FILESDIR}"/mongodb.tempfiles mongodb.conf
+
 	insinto /etc/logrotate.d/
 	newins "${FILESDIR}/${PN}.logrotate" ${PN}
 
 	# see bug #526114
 	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-
-	diropts -m0750 -o mongodb -g mongodb
-	keepdir /var/log/${PN}
 }
 
 pkg_postinst() {
+	tmpfiles_process mongodb.conf
+
 	ewarn "Make sure to read the release notes and follow the upgrade process:"
 	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
 	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"