chore: apply changes made in mainsailOS 0.6.1

This commit is contained in:
th33xitus
2022-02-03 16:57:55 +01:00
parent 634d795557
commit 005a5061a7
3 changed files with 32 additions and 11 deletions

View File

@@ -14,7 +14,7 @@ server {
gzip_comp_level 4; gzip_comp_level 4;
gzip_buffers 16 8k; gzip_buffers 16 8k;
gzip_http_version 1.1; gzip_http_version 1.1;
gzip_types text/plain text/css text/xml text/javascript application/x-javascript application/json application/xml application/javascript; gzip_types text/plain text/css text/xml text/javascript application/javascript application/x-javascript application/json application/xml;
# web_path from <<UI>> static files # web_path from <<UI>> static files
root /home/pi/<<UI>>; root /home/pi/<<UI>>;
@@ -49,6 +49,8 @@ server {
location ~ ^/(printer|api|access|machine|server)/ { location ~ ^/(printer|api|access|machine|server)/ {
proxy_pass http://apiserver$request_uri; proxy_pass http://apiserver$request_uri;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -56,18 +58,38 @@ server {
} }
location /webcam/ { location /webcam/ {
postpone_output 0;
proxy_buffering off;
proxy_ignore_headers X-Accel-Buffering;
access_log off;
error_log off;
proxy_pass http://mjpgstreamer1/; proxy_pass http://mjpgstreamer1/;
} }
location /webcam2/ { location /webcam2/ {
postpone_output 0;
proxy_buffering off;
proxy_ignore_headers X-Accel-Buffering;
access_log off;
error_log off;
proxy_pass http://mjpgstreamer2/; proxy_pass http://mjpgstreamer2/;
} }
location /webcam3/ { location /webcam3/ {
postpone_output 0;
proxy_buffering off;
proxy_ignore_headers X-Accel-Buffering;
access_log off;
error_log off;
proxy_pass http://mjpgstreamer3/; proxy_pass http://mjpgstreamer3/;
} }
location /webcam4/ { location /webcam4/ {
postpone_output 0;
proxy_buffering off;
proxy_ignore_headers X-Accel-Buffering;
access_log off;
error_log off;
proxy_pass http://mjpgstreamer4/; proxy_pass http://mjpgstreamer4/;
} }
} }

View File

@@ -18,10 +18,10 @@ trusted_clients:
FE80::/10 FE80::/10
::1/128 ::1/128
cors_domains: cors_domains:
*.lan http://*.lan
*.local http://*.local
*://my.mainsail.xyz http://*://my.mainsail.xyz
*://app.fluidd.xyz http://*://app.fluidd.xyz
[file_manager] [file_manager]
config_path: %CFG% config_path: %CFG%
@@ -33,18 +33,17 @@ log_path: %LOG%
[update_manager] [update_manager]
channel: dev channel: dev
refresh_interval: 168
[update_manager mainsail] [update_manager mainsail]
type: web_beta type: web
repo: mainsail-crew/mainsail repo: mainsail-crew/mainsail
path: ~/mainsail path: ~/mainsail
refresh_interval: 24
[update_manager fluidd] [update_manager fluidd]
type: web_beta type: web
repo: fluidd-core/fluidd repo: fluidd-core/fluidd
path: ~/fluidd path: ~/fluidd
refresh_interval: 24
#[update_manager KlipperScreen] #[update_manager KlipperScreen]
#type: git_repo #type: git_repo

View File

@@ -90,9 +90,9 @@ EOT
sudo /bin/sh -c "cat > /etc/logrotate.d/webcamd" << EOF sudo /bin/sh -c "cat > /etc/logrotate.d/webcamd" << EOF
/var/log/webcamd.log /var/log/webcamd.log
{ {
rotate 4 rotate 2
weekly weekly
maxsize 64M maxsize 32M
missingok missingok
notifempty notifempty
compress compress