Update for datapath changes

8 files changed, 47 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3b7d0fbff92e..2c097c36c46a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
 pkgbase = moonraker-git
 	pkgdesc = HTTP frontend for Klipper 3D printer firmware
-	pkgver = r1449.5d856b9
+	pkgver = r1579.358aee9
 	pkgrel = 1
 	url = https://github.com/Arksine/moonraker
+	install = moonraker.install
 	arch = any
 	license = GPL3
 	makedepends = git
@@ -30,18 +31,22 @@ pkgbase = moonraker-git
 	conflicts = moonraker
 	backup = etc/klipper/moonraker.conf
 	source = git+https://github.com/Arksine/moonraker.git#branch=master
+	source = moonraker.install
 	source = moonraker.conf
 	source = moonraker.service
+	source = moonraker.env
 	source = moonraker.rules
 	source = sysusers.conf
 	source = tmpfiles.conf
 	source = moonraker-klipper.cfg
 	sha256sums = SKIP
-	sha256sums = d7ecdfbe5ec156f98277f7f3f8f13807e7d81f47d33a075936af3915407caf54
-	sha256sums = b47549a8b888018b03bf41c9b6ccabf8c9e15d3b00a98bd21af85e9b4ec77f5c
+	sha256sums = b118f346ec57228add79b9c37555adc5dbae4cb6de0e39659912376b5ad2e932
+	sha256sums = 85855665ec1ff10c95529f456d8b00314d8909db4d83be48bb76d0fc2a5fd3d0
+	sha256sums = d99c172a24e166b724bb0603a8909f2137a75b7e0d1cf9c883d9300f2a29f382
+	sha256sums = 5611f1a48bb18d0d95a31eaead4f59d84c0ae5e3c407f3488770e2236b97c3bf
 	sha256sums = cef040e973a9bb697659d1506a37a5f829551d5cc96e3f81ff588d5bd67cf1d0
 	sha256sums = 549309fd129c8c665a5aed2d4229c20e5a9927f4fbdc937e0982db4785b9ee0d
-	sha256sums = 7b908a1c3e0b56523d27db5283e2f546f93051fe855cc949635fafa37ba2f416
-	sha256sums = caa868a447ab94bd3e5f86cdf70e5deeb17b233077d94a424a682dfe49349a96
+	sha256sums = ee763cc109210583c21006054730f1b2422d705b03f2bb04017aab8441039a9b
+	sha256sums = b6c35114ab2886acbd9168bb4588c86d3baea91ab38eda67b5ef38327cd7b11f
 
 pkgname = moonraker-git
diff --git a/PKGBUILD b/PKGBUILD
index 24168d225c75..962a6d080938 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Wilhelm Schuster <aur [aT] rot13 dot io>
 pkgname=moonraker-git
-pkgver=r1449.5d856b9
+pkgver=r1579.358aee9
 pkgrel=1
 pkgdesc="HTTP frontend for Klipper 3D printer firmware"
 arch=(any)
@@ -31,14 +31,17 @@ optdepends=("polkit: enable service and machine control through moonraker"
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
 backup=('etc/klipper/moonraker.conf')
-source=('git+https://github.com/Arksine/moonraker.git#branch=master' 'moonraker.conf' 'moonraker.service' 'moonraker.rules' 'sysusers.conf' 'tmpfiles.conf' 'moonraker-klipper.cfg')
+install=moonraker.install
+source=('git+https://github.com/Arksine/moonraker.git#branch=master' 'moonraker.install' 'moonraker.conf' 'moonraker.service' 'moonraker.env' 'moonraker.rules' 'sysusers.conf' 'tmpfiles.conf' 'moonraker-klipper.cfg')
 sha256sums=('SKIP'
-            'd7ecdfbe5ec156f98277f7f3f8f13807e7d81f47d33a075936af3915407caf54'
-            'b47549a8b888018b03bf41c9b6ccabf8c9e15d3b00a98bd21af85e9b4ec77f5c'
+            'b118f346ec57228add79b9c37555adc5dbae4cb6de0e39659912376b5ad2e932'
+            '85855665ec1ff10c95529f456d8b00314d8909db4d83be48bb76d0fc2a5fd3d0'
+            'd99c172a24e166b724bb0603a8909f2137a75b7e0d1cf9c883d9300f2a29f382'
+            '5611f1a48bb18d0d95a31eaead4f59d84c0ae5e3c407f3488770e2236b97c3bf'
             'cef040e973a9bb697659d1506a37a5f829551d5cc96e3f81ff588d5bd67cf1d0'
             '549309fd129c8c665a5aed2d4229c20e5a9927f4fbdc937e0982db4785b9ee0d'
-            '7b908a1c3e0b56523d27db5283e2f546f93051fe855cc949635fafa37ba2f416'
-            'caa868a447ab94bd3e5f86cdf70e5deeb17b233077d94a424a682dfe49349a96')
+            'ee763cc109210583c21006054730f1b2422d705b03f2bb04017aab8441039a9b'
+            'b6c35114ab2886acbd9168bb4588c86d3baea91ab38eda67b5ef38327cd7b11f')
 
 pkgver() {
   cd "$srcdir/${pkgname%-git}"
@@ -62,6 +65,7 @@ package() {
 
   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/moonraker.env" "$pkgdir/var/opt/moonraker/systemd/moonraker.env"
   install -Dm644 "$srcdir/sysusers.conf" "$pkgdir/usr/lib/sysusers.d/moonraker.conf"
   install -Dm644 "$srcdir/tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/moonraker.conf"
   install -Dm644 "$srcdir/moonraker-klipper.cfg" "$pkgdir/usr/share/doc/moonraker/moonraker-klipper.cfg"
diff --git a/moonraker-klipper.cfg b/moonraker-klipper.cfg
index 0d52b7bba000..dc447e360af7 100644
--- a/moonraker-klipper.cfg
+++ b/moonraker-klipper.cfg
@@ -3,5 +3,5 @@
 [display_status]
 
 [virtual_sdcard]
-path: /var/opt/moonraker/gcode
+path: /var/opt/moonraker/gcodes
 
diff --git a/moonraker.conf b/moonraker.conf
index 36c0082acce6..c65da9da72ac 100644
--- a/moonraker.conf
+++ b/moonraker.conf
@@ -7,39 +7,12 @@ port: 7125
 #   server will only be started of the certificate and key options outlined
 #   below are provied.  The default is 7130.
 #ssl_port: 7130
-#   The path to a self signed ssl certificate.  The default is no path, which
-#   disables HTTPS.
-#ssl_certificate_path:
-#   The path to the private key used to signed the certificate.  The default
-#   is no path, which disables HTTPS.
-#ssl_key_path:
 #   The address of Unix Domain Socket used to communicate with Klipper.
 klippy_uds_address: /run/klipper/ud_sock
 #   The maximum size allowed for a file upload.
 #max_upload_size: 200
-#   When set to True Moonraker will log in verbose mode.  During this stage
-#   of development the default is True.  In the future this will change.
-enable_debug_logging: True
-#   The path to a directory where configuration files are located. This
-#   directory may contain Klipper config files (printer.cfg) or Moonraker
-#   config files (moonraker.conf).  Clients may also write their own config
-#   files to this directory.  Note that this may not be the system root
-#   (ie: "/") and moonraker must have read and write access permissions
-#   for this directory.
 
 [file_manager]
-#   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.
-config_path: /etc/klipper
-#   An optional path to a directory where log files are located.  Users may
-#   configure various applications to store logs here and Moonraker will serve
-#   them at "/server/files/logs/*".  The default is no log paths.
-#log_path:
-#   When set to True the file manager will add uploads to the job_queue when
-#   the `start_print` flag has been set.  The default if False.
 #queue_gcode_uploads: False
 #   When set to True gcode files will be run through a "preprocessor"
 #   during metdata extraction if object tags are detected.  This preprocessor
@@ -55,14 +28,12 @@ config_path: /etc/klipper
 #   "systemd_dbus", or "systemd_cli".  If the provider is set to "none" service
 #   action APIs will be disabled.  The default is systemd_dbus.
 provider: systemd_cli
+#   Enables validation of Moonraker's systemd service unit. The Archlinux
+#   package uses an altered service unit which will cause the validation to
+#   always fail, thus validation has to be disabled.
+validate_service: False
 
 [database]
-#   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
 
 [data_store]
 #   The maximum number of temperature values to store for each sensor. Note
@@ -106,6 +77,6 @@ database_path: /var/opt/moonraker/db
 #  http://klipper-printer.local
 #  http://second-printer.local:7125
 
-#[octoprint_compat]
+[octoprint_compat]
 
 [history]
diff --git a/moonraker.env b/moonraker.env
new file mode 100644
index 000000000000..869cb9445dcf
--- /dev/null
+++ b/moonraker.env
@@ -0,0 +1 @@
+MOONRAKER_ARGS="-v -g -d /var/opt/moonraker -c /etc/klipper/moonraker.conf"
diff --git a/moonraker.install b/moonraker.install
new file mode 100644
index 000000000000..ee9fb934dabc
--- /dev/null
+++ b/moonraker.install
@@ -0,0 +1,15 @@
+## arg 1:  the new package version
+## arg 2:  the old package version
+post_upgrade() {
+  if [[ "$(vercmp "r1494.358aee9" "${2}")" -eq 1 ]]; then
+    echo <<END
+moonraker now uses a unified "datapath" directory for all runtime files. See
+https://moonraker.readthedocs.io/en/latest/installation/#data-folder-structure
+https://moonraker.readthedocs.io/en/latest/user_changes/#october-14th-2022
+for more information. This means the location of /var/opt/moonraker/db and
+/var/opt/moonraker/gcode changes to /var/opt/moonraker/database and
+/var/opt/moonraker/gcodes respectively. The old locations can be copied or
+symlinked over.
+END
+  fi
+}
diff --git a/moonraker.service b/moonraker.service
index b93a2a31d1c6..0573654115cc 100644
--- a/moonraker.service
+++ b/moonraker.service
@@ -9,7 +9,8 @@ User=klipper
 SupplementaryGroups=moonraker-admin
 SyslogIdentifier=moonraker
 RemainAfterExit=yes
-ExecStart=/usr/bin/python /opt/moonraker/moonraker/moonraker.py -c /etc/klipper/moonraker.conf -n
+EnvironmentFile=/var/opt/moonraker/systemd/moonraker.env
+ExecStart=/usr/bin/python /opt/moonraker/moonraker/moonraker.py -n $MOONRAKER_ARGS
 Restart=always
 RestartSec=10
 
diff --git a/tmpfiles.conf b/tmpfiles.conf
index 31d2cdc1dde8..e4b0c835e399 100644
--- a/tmpfiles.conf
+++ b/tmpfiles.conf
@@ -1,2 +1,3 @@
-d /var/opt/moonraker/gcode 0755 klipper klipper - -
-d /var/opt/moonraker/db 0755 klipper klipper - -
+d /var/opt/moonraker 0755 klipper klipper - -
+d /var/opt/moonraker/gcodes 0755 klipper klipper - -
+d /var/opt/moonraker/database 0755 klipper klipper - -