New database functionality requires new dependency and config file updates

4 files changed, 15 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e0a3826180e7..bd41aec6b6a6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = moonraker-git
 	pkgdesc = HTTP frontend for Klipper 3D printer firmware
-	pkgver = r396.1f61357
+	pkgver = r412.bf48744
 	pkgrel = 2
 	url = https://github.com/Arksine/moonraker
 	arch = any
@@ -9,6 +9,7 @@ pkgbase = moonraker-git
 	depends = python-tornado
 	depends = python-pillow
 	depends = python-pyserial
+	depends = python-lmdb
 	depends = libgpiod
 	provides = moonraker
 	conflicts = moonraker
@@ -18,9 +19,9 @@ pkgbase = moonraker-git
 	source = tmpfiles.conf
 	source = moonraker-klipper.cfg
 	sha256sums = SKIP
-	sha256sums = 356dc03a6119adc088f3feacc0a7d7f52d2f569e6189b12263b9baf69a47a1d3
+	sha256sums = 7be8b6dff8daee271bf9623fefa91b35b3fe9c34d12e14e33fa84b25bb885c25
 	sha256sums = 120c85c212ec57c1365e3e94f9d38ba9a5d9bd57e76692733e7cd8fe167afff0
-	sha256sums = b733fc3f697f25299720f06bbc10bb6e747609005e7e8f8510a42ed19a7aacc6
+	sha256sums = 7b908a1c3e0b56523d27db5283e2f546f93051fe855cc949635fafa37ba2f416
 	sha256sums = caa868a447ab94bd3e5f86cdf70e5deeb17b233077d94a424a682dfe49349a96
 
 pkgname = moonraker-git
diff --git a/PKGBUILD b/PKGBUILD
index b2ce500d22f3..911234f4eae6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Wilhelm Schuster <aur [aT] rot13 dot io>
 pkgname=moonraker-git
-pkgver=r396.1f61357
+pkgver=r412.bf48744
 pkgrel=2
 pkgdesc="HTTP frontend for Klipper 3D printer firmware"
 arch=(any)
@@ -10,14 +10,15 @@ depends=(klipper
          python-tornado
          python-pillow
          python-pyserial
+         python-lmdb
          libgpiod)
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
 source=('git+https://github.com/Arksine/moonraker.git#branch=master' 'moonraker.conf' 'moonraker.service' 'tmpfiles.conf' 'moonraker-klipper.cfg')
 sha256sums=('SKIP'
-            '356dc03a6119adc088f3feacc0a7d7f52d2f569e6189b12263b9baf69a47a1d3'
+            '7be8b6dff8daee271bf9623fefa91b35b3fe9c34d12e14e33fa84b25bb885c25'
             '120c85c212ec57c1365e3e94f9d38ba9a5d9bd57e76692733e7cd8fe167afff0'
-            'b733fc3f697f25299720f06bbc10bb6e747609005e7e8f8510a42ed19a7aacc6'
+            '7b908a1c3e0b56523d27db5283e2f546f93051fe855cc949635fafa37ba2f416'
             'caa868a447ab94bd3e5f86cdf70e5deeb17b233077d94a424a682dfe49349a96')
 
 pkgver() {
@@ -29,7 +30,6 @@ pkgver() {
 package() {
   cd "$srcdir/${pkgname%-git}"
 
-  install -dm755 "$pkgdir/etc/moonraker"
   install -Dm644 "$srcdir/moonraker.conf" "$pkgdir/etc/klipper/moonraker.conf"
   install -Dm644 "$srcdir/moonraker.service" "$pkgdir/usr/lib/systemd/system/moonraker.service"
   install -Dm644 "$srcdir/tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/moonraker.conf"
diff --git a/moonraker.conf b/moonraker.conf
index 9a1d16fd23a1..3afb98cefd44 100644
--- a/moonraker.conf
+++ b/moonraker.conf
@@ -17,6 +17,12 @@ enable_debug_logging: True
 #   (ie: "/") and moonraker must have read and write access permissions
 #   for this directory.
 config_path: /etc/klipper
+#   The path to the folder that stores Moonraker's lmdb database files.
+#   It is NOT recommended to place this file in a location that is served by
+#   Moonraker (such as the "config_path" or the location where gcode
+#   files are stored).  If the folder does not exist an attempt will be made
+#   to create it.  The default is ~/.moonraker_database.
+database_path: /var/opt/moonraker/db
 #   The maximum number of temperature values to store for each sensor. Note
 #   that this value also applies to the "target", "power", and "fan_speed"
 #   if the sensor reports them.  The default is 1200, which is enough to
diff --git a/tmpfiles.conf b/tmpfiles.conf
index ba2336b9a934..31d2cdc1dde8 100644
--- a/tmpfiles.conf
+++ b/tmpfiles.conf
@@ -1 +1,2 @@
 d /var/opt/moonraker/gcode 0755 klipper klipper - -
+d /var/opt/moonraker/db 0755 klipper klipper - -