Correction to files; add default moonraker conf

klipper/rootfs/etc/cont-init.d/moonraker.sh

@@ -1,10 +1,14 @@
 #!/usr/bin/with-contenv bashio
 
-if [ ! -d /data/klipper ]; then
+if [ ! -d /data/moonraker ]; then
     git clone https://github.com/Arksine/moonraker.git /data/moonraker
 fi
 
 if [ ! -d /data/moonraker-env ]; then
     virtualenv /data/moonraker-env
     /data/moonraker-env/bin/pip install -r /data/moonraker/scripts/moonraker-requirements.txt
+fi
+
+if [ ! -f /data/klipper_config/moonraker.conf ]; then
+    cp /usr/share/templates/moonraker.conf /data/klipper_config/moonraker.conf
 fi

klipper/rootfs/etc/services.d/klipper/run

@@ -2,12 +2,14 @@
 
 bashio::log.info "Starting Klipper..."
 
-KLIPPER_PYTHON=/data/python/klipper/bin/python
-KLIPPY=/data/src/klipper/klippy/klippy.py
-KLIPPER_CFG=/data/config/klipper/printer.cfg
+KLIPPER_PYTHON=/data/klippy-env/bin/python
+KLIPPY=/data/klipper/klippy/klippy.py
+KLIPPER_CFG=/data/klipper_config/printer.cfg
 KLIPPY_LOGFILE=/tmp/klippy.log
 KLIPPY_UDS=/tmp/klippy_uds
 
+mkdir -p /data/klipper_config
+
 touch ${KLIPPY_LOGFILE}
 touch ${KLIPPER_CFG}
 

klipper/rootfs/etc/services.d/moonraker/run

@@ -2,17 +2,13 @@
 
 bashio::log.info "Starting Moonraker..."
 
-MOONRAKER_PYTHON=/data/python/moonraker/bin/python
-MOONRAKER=/data/src/moonraker/moonraker/moonraker.py
-if [ -f /data/config/klipper/moonraker.conf ]; then
-    bashio::log.notice "Using custom moonraker.conf"
-    MOONRAKER_CFG=/data/config/klipper/moonraker.conf
-else
-    bashio::log.notice "Using default moonraker.conf"
-    MOONRAKER_CFG=/root/config/moonraker/moonraker.conf
-fi
+MOONRAKER_PYTHON=/data/moonraker-env/bin/python
+MOONRAKER=/data/moonraker/moonraker/moonraker.py
+MOONRAKER_CFG=/data/klipper_config/moonraker.conf
 MOONRAKER_LOGFILE=/tmp/moonraker.log
 
+mkdir -p /data/klipper_config
+
 touch ${MOONRAKER_LOGFILE}
 touch ${MOONRAKER_CFG}