From ac8a13088f5d66a7b7d42e657a7df4cf94bdf4b2 Mon Sep 17 00:00:00 2001
From: Brian Vanderbusch <chief@hackerhappyhour.com>
Date: Wed, 9 Dec 2020 13:08:14 -0600
Subject: [PATCH 1/2] enable usage of backup/restore plugin

fixes #92
---
 Dockerfile                                 | 2 ++
 root/etc/services.d/octoprint/run          | 2 +-
 root/octoprint/{ => octoprint}/config.yaml | 3 ---
 3 files changed, 3 insertions(+), 4 deletions(-)
 rename root/octoprint/{ => octoprint}/config.yaml (86%)

diff --git a/Dockerfile b/Dockerfile
index 3b71849..8b7e293 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -56,6 +56,7 @@ RUN	curl -fsSLO --compressed --retry 3 --retry-delay 10 \
 
 WORKDIR /opt/octoprint
 RUN pip install .
+RUN mkdir -p /octoprint/octoprint /octoprint/plugins
 
 # Install mjpg-streamer
 RUN curl -fsSLO --compressed --retry 3 --retry-delay 10 \
@@ -63,6 +64,7 @@ RUN curl -fsSLO --compressed --retry 3 --retry-delay 10 \
   && mkdir /mjpg \
   && tar xzf master.tar.gz -C /mjpg
 
+
 WORKDIR /mjpg/mjpg-streamer-master/mjpg-streamer-experimental
 RUN make
 RUN make install
diff --git a/root/etc/services.d/octoprint/run b/root/etc/services.d/octoprint/run
index f5d6de4..fb4f5dd 100644
--- a/root/etc/services.d/octoprint/run
+++ b/root/etc/services.d/octoprint/run
@@ -1,3 +1,3 @@
 #!/usr/bin/with-contenv sh
 
-exec octoprint serve --iknowwhatimdoing --host 0.0.0.0 --basedir /octoprint
+exec octoprint serve --iknowwhatimdoing --host 0.0.0.0 --basedir /octoprint/octoprint
diff --git a/root/octoprint/config.yaml b/root/octoprint/octoprint/config.yaml
similarity index 86%
rename from root/octoprint/config.yaml
rename to root/octoprint/octoprint/config.yaml
index 381015b..99eb96c 100644
--- a/root/octoprint/config.yaml
+++ b/root/octoprint/octoprint/config.yaml
@@ -5,6 +5,3 @@ webcam:
   ffmpeg: /usr/bin/ffmpeg
   snapshot: http://localhost:8080/?action=snapshot
   stream: /webcam/?action=stream
-plugins:
-  _disabled:
-  - backup

From a915402b15a72f6700c387366f3991c13ab50b70 Mon Sep 17 00:00:00 2001
From: Brian Vanderbusch <chief@hackerhappyhour.com>
Date: Wed, 9 Dec 2020 14:17:13 -0600
Subject: [PATCH 2/2] update docs and example with new config paths

---
 README.md          | 4 ++--
 compose.test.yml   | 2 +-
 docker-compose.yml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 6980d75..e64f5a6 100644
--- a/README.md
+++ b/README.md
@@ -83,11 +83,11 @@ then run the following commands:
 docker-compose up -d config-editor
 ```
 
-Now go to `http://<octoprint_ip_or_url>:8443/?folder=/config` in your browser to edit your octoprint files!
+Now go to `http://<octoprint_ip_or_url>:8443/?folder=/octoprint` in your browser to edit your octoprint files!
 Use the 'explorer' (accessible by clicking the hamburger menu icon) to explore folder and files to load
 into the editor workspace. 
 
-All configuration files are in the `/config` folder, and the active configuration will be accessible at `/config/config.yaml`
+All configuration files are in the `octoprint` folder, and the active configuration will be accessible at `/octoprint/octoprint/config.yaml`
 
 When you're done, we recommend you stop and remove this service/container:
 
diff --git a/compose.test.yml b/compose.test.yml
index a62ddfb..b2207b8 100644
--- a/compose.test.yml
+++ b/compose.test.yml
@@ -24,7 +24,7 @@ services:
       - GUID=0
       - TZ=America/Chicago
     volumes:
-      - octoprint:/config
+      - octoprint:/octoprint
 
 volumes:
   octoprint:
diff --git a/docker-compose.yml b/docker-compose.yml
index 5886177..9479acc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -33,7 +33,7 @@ services:
   #    - GUID=0
   #    - TZ=America/Chicago
   #  volumes:
-  #    - octoprint:/config
+  #    - octoprint:/octoprint
 
 volumes:
   octoprint: