allow configuration of unix path

.gitignore

@@ -11,3 +11,4 @@ start_moonraker
 .pdm.toml
 build
 dist
+.pdm-build

.vscode/launch.json

@@ -0,0 +1,20 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Python: Current File",
+      "type": "python",
+      "request": "launch",
+      "program": "moonraker/moonraker.py",
+      "console": "integratedTerminal",
+      "justMyCode": true,
+      "args": [
+        "-c", "moonraker.conf",
+        "-a", "/tmp/moonraker.sock"
+      ]
+    }
+  ]
+}

moonraker.conf

@@ -0,0 +1,29 @@
+# Sample Moonraker Configuration File
+#
+# !!! Moonraker does not load this file.  See configuration.md !!!
+# !!! for details on path to Moonraker's configuration.        !!!
+#
+
+[server]
+# Bind server defaults of 0.0.0.0, port 7125
+enable_debug_logging: False
+
+[authorization]
+enabled: True
+trusted_clients:
+# Enter your client IP here or range here
+ 192.168.1.0/24
+cors_domains:
+# Allow CORS requests for Fluidd
+ http://app.fluidd.xyz
+
+# Enable OctoPrint compatibility for Slicer uploads
+# Supports Cura, Slic3r, and Slic3r dervivatives
+# (PrusaSlicer, SuperSlicer)
+[octoprint_compat]
+# Default webcam config values:
+# flip_h = false
+# flip_v = false
+# rotate_90 = false
+# stream_url = /webcam/?action=stream
+# webcam_enabled = true

moonraker/components/extensions.py

@@ -117,7 +117,7 @@ async def start_unix_server(self) -> None:
         comms_path = data_path.joinpath("comms")
         if not comms_path.exists():
             comms_path.mkdir()
-        sock_path = comms_path.joinpath("moonraker.sock")
+        sock_path = pathlib.Path(self.server.get_app_args()["api_server"])
         logging.info(f"Creating Unix Domain Socket at '{sock_path}'")
         self.uds_server = await asyncio.start_unix_server(
             self.on_unix_socket_connected, sock_path, limit=UNIX_BUFFER_LIMIT

moonraker/server.py

@@ -488,6 +488,10 @@ def main(from_package: bool = True) -> None:
     parser.add_argument(
         "-l", "--logfile", default=None, metavar='<logfile>',
         help="log file name and location")
+    parser.add_argument(
+        "-a", "--api-server", default=None, metavar='<socketfile>',
+        help="api server unix domain socket filename"
+    )
     parser.add_argument(
         "-n", "--nologfile", action='store_true',
         help="disable logging to a file")
@@ -550,6 +554,18 @@ def main(from_package: bool = True) -> None:
     app_args["python_version"] = sys.version.replace("\n", " ")
     log_manager = LogManager(app_args, startup_warnings)
 
+    # Setup unix socket
+    if cmd_line_args.api_server:
+        app_args["api_server"] = os.path.normpath(
+            os.path.expanduser(cmd_line_args.api_server))
+    else:
+        data_path = pathlib.Path(app_args["data_path"])
+        comms_path = data_path.joinpath("comms")
+        if not comms_path.exists():
+            comms_path.mkdir()
+        sock_path = comms_path.joinpath("moonraker.sock")
+        app_args["api_server"] = os.path.normpath(os.path.expanduser(sock_path))
+
     # Start asyncio event loop and server
     event_loop = EventLoop()
     alt_config_loaded = False