Skip to content

Commit

Permalink
Merge branch 'main' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Kragrathea committed Oct 16, 2021
2 parents 162855e + 378aa04 commit 4b0b54a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
14 changes: 6 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,20 @@ Depending on your setup you will probably have to edit Moonraker.conf to allow a

Partial moonraker.conf
```
[authorization]
enabled: True #<--If this is True then PrettyGCode needs to use an API Key to connect
[authorization]#<--If this section is present then PrettyGCode needs to use an API Key to connect
cors_domains:
*.local
*.lan
*://app.fluidd.xyz
*.local:7136 #<--Allow PrettyGCode (port 7136) on a .*local domain. OR...
*:7136 #<--Allow PrettyGCode (port 7136) on all domains
*:7136 #<--Allow PrettyGCode (port 7136) on all domains (recommended) OR...
*.local:7136 #<--Allow PrettyGCode (port 7136) on just .*local domain. (more secure I guess)
trusted_clients:
10.0.0.0/8
127.0.0.0/8
169.254.0.0/16
172.16.0.0/12
192.168.1.0/160 #<--Trust local network machines. Only needed if [authorization] enabled is True.
192.168.1.0/160 #<--Trust local network machines. Only needed if [authorization] enabled.
FE80::/10
::1/128
Expand Down Expand Up @@ -84,8 +83,7 @@ For now to trouble shoot the connection you need to open the browsers developer
- Make sure the domain you are browsing from is included in the cors_domain section of moonraker.conf

```
[authorization]
enabled: True #<--If this is True then PrettyGCode needs to use an API Key to connect
[authorization]#<--If this section is present then PrettyGCode needs to use an API Key to connect
cors_domains:
*.local
*.lan
Expand All @@ -95,7 +93,7 @@ cors_domains:

You may have to enable [octoprint_compat] in moonraker.conf file.

# Manually setting server via URL parameter (not recommended)
# Manually setting server via URL parameter

If your server is located on another machine or isn't being detected you can specifiy it on the command line like this:

Expand Down
2 changes: 1 addition & 1 deletion pgcode.html
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@
</form>
</div>
<script>
// Get the modal....
// Get the modal...
var modal = document.getElementById('connect-dialog');

// When the user clicks anywhere outside of the modal, close it
Expand Down

0 comments on commit 4b0b54a

Please sign in to comment.