-
-
Notifications
You must be signed in to change notification settings - Fork 253
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Drop the use of the uStreamer port Ansible variable (#1563)
Related #1551 In #1562, we're moving uStreamer from port `8001` to port `48001`. However, before we do that I thought it might be a good time to hardcode the port number and <s>enforce non-user-configurability</s> drop the use of the `ustreamer_port` Ansible variable. According to tiny-pilot/tinypilot-pro#972, `ustreamer_port` is already considered a non-user-configurable variable. This PR enforces `ustreamer_port` as being non-user-configurable. This PR does the following: * Reverts #1493 (which introduced that `_CONSTANTS` variable in `app/update/settings.py`) * Hardcodes the uStreamer port to `8001` in the TinyPilot NGINX config and the uStreamer launcher script. * Drops the use of the `ustreamer_port` Ansible variable. * Cleans up the `/home/tinypilot/settings.yml` file by removing any user-defined `ustreamer_port` at install/update time. Notes 1. TinyPilot Pro would require the following additional change: ```diff # debian-pkg/debian/tinypilot.postinst KEYBOARD_PATH = '{{ tinypilot_keyboard_interface }}' MOUSE_PATH = '{{ tinypilot_mouse_interface }}' -USTREAMER_BASEURL = 'http://127.0.0.1:{{ ustreamer_port }}' +USTREAMER_BASEURL = 'http://127.0.0.1:8001' ``` <a data-ca-tag href="https://codeapprove.com/pr/tiny-pilot/tinypilot/1563"><img src="https://codeapprove.com/external/github-tag-allbg.png" alt="Review on CodeApprove" /></a>
- Loading branch information
1 parent
c1aa1b4
commit 710ed07
Showing
7 changed files
with
27 additions
and
51 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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