Custom webroot & disabled controls for webcam server - #359
Merged
Conversation
Instead of ./www we now use ./www-octopi by default which only contains an index.html (generated during image build) that displays only the snapshot and stream for debugging purposes. The command action on mjpg-streamer (which control.html of the stock webroot utilizes) has also been disabled via "-n". Two new variables have been introduced in /boot/octopi.txt to allow configuring the webroot to use and the additional options for output_http.so (by default only "-n"), in case power users need to change back or otherwise customize stock behaviour. Closes guysoft#358
Owner
|
I need to remember to cherry-pick these changes in to CustomPiOS beyond this point |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Instead of ./www we now use ./www-octopi by default which only
contains an index.html (generated during image build) that displays
only the snapshot and stream for debugging purposes.
The command action on mjpg-streamer (which control.html of the stock
webroot utilizes) has also been disabled via "-n".
Two new variables have been introduced in /boot/octopi.txt to
allow configuring the webroot to use and the additional options
for output_http.so (by default only "-n"), in case power users
need to change back or otherwise customize stock behaviour.
Closes #358