remove re-enable via script

this can be done by removing the container and starting
a new container with the proper env var instead

Author: LongLiveCHIEF

Makefile

@@ -59,3 +59,17 @@ buildx-camera:
 	--cache-to ${CACHE} \
 	--build-arg OCTOPRINT_BASE_IMAGE=1.4.2 \
 	--progress plain -t octoprint/octoprint:ci-camera -f ./camera/Dockerfile.camera .
+
+test-up:
+	docker-compose -f compose.test.yml up -d
+	@docker-compose -f compose.test.yml logs -f octoprint
+
+test-stop:
+	@docker-compose -f compose.test.yml stop
+
+test-start:
+	docker-compose -f compose.test.yml start
+	@docker-compose -f compose.test.yml logs -f octoprint
+
+test-clean:
+	docker-compose -f compose.test.yml down

root/etc/cont-init.d/01-mjpeg-streamer-config

@@ -1,24 +1,13 @@
 #!/usr/bin/with-contenv bash
 
-DISABLED_SERVICES_DIR=/etc/disabled.services.d
-: "${ENABLE_MJPEG_STREAMER:=false}"
 
 # disable mjpg-streamer service
 if ! $ENABLE_MJPEG_STREAMER; then
-  if [ -d $DISABLED_SERVICES_DIR/mjpg-streamer ]; then
+  if [ -d /etc/disabled.services.d/mjpg-streamer ]; then
     echo " - INFO - ==> mjpg-streamer service disabled"
   else
     echo " - INFO - ==> disabling mjpg-streamer service"
-    mv /etc/services.d/mjpg-streamer $DISABLED_SERVICES_DIR
+    mv /etc/services.d/mjpg-streamer /etc/disabled.services.d
     echo " - INFO - ==> disable mjpg-streamer success"
   fi
-else
-  # allow user to re-enable
-  if [ ! -d /etc/services.d/mjpg-streamer ] && [ -d $DISABLED_SERVICES_DIR/mjpg-streamer ]; then
-    echo " - INFO - ==> re-enabling mjpg-streamer service"
-    mv $DISABLED_SERVICES_DIR/mjpg-streamer /etc/services.d/mjpg-streamer
-    echo " - INFO - ==> enable mjpg-streamer service ok"
-  else 
-    echo " - INFO - ==> mjpeg-streamer service enabled"
-  fi
 fi