Patch 001 (#28)

* Updates001

* remove canserial

* update build

* Normalize all the line endings

* Allow cmake downgrades

Author: raymondh2

.actrc

@@ -0,0 +1,4 @@
+-P ubuntu-latest=catthehacker/ubuntu:act-latest
+-P ubuntu-20.04=catthehacker/ubuntu:act-20.04
+-P ubuntu-18.04=catthehacker/ubuntu:act-18.04
+ubuntu-16.04=catthehacker/ubuntu:act-16.04

src/config

@@ -2,4 +2,4 @@ export DIST_NAME=MainSailOS
 export DIST_VERSION=0.2.0
 export BASE_IMAGE_ENLARGEROOT=2000
 export BASE_IMAGE_RESIZEROOT=500
-export MODULES="base(network,raspicam,klipper_moonraker,canserial,mainsail,mjpgstreamer,password-for-sudo)"
+export MODULES="base(network,raspicam,mjpgstreamer,password-for-sudo)"

src/modules/klipper_moonraker/filesystem/home/pi/klipper_config/moonraker.conf

@@ -31,4 +31,4 @@ trusted_clients:
 [update_manager client mainsail]
 type: web
 repo: meteyou/mainsail
-path: ~/mainsail
+path: ~/mainsail

src/modules/mainsail/filesystem/root/etc/nginx/sites-available/mainsail

@@ -1,9 +1,9 @@
-server {
-    listen 80 default_server;
-
-    access_log /var/log/nginx/mainsail-access.log;
-    error_log /var/log/nginx/mainsail-error.log;
-
+server {
+    listen 80 default_server;
+
+    access_log /var/log/nginx/mainsail-access.log;
+    error_log /var/log/nginx/mainsail-error.log;
+
     #disable this section on smaller hardware like a pi zero
     gzip on;
     gzip_vary on;
@@ -14,43 +14,42 @@ server {
     gzip_http_version 1.1;
     gzip_types text/plain text/css text/xml text/javascript application/x-javascript application/json application/xml;
 
-    #web_path from mainsail static files
-    root /home/pi/mainsail;
-
-    index index.html;
-    server_name _;
-
-    #max upload size for gcodes (0 = no limit)
-    client_max_body_size 0;
-
-    location / {
-        try_files $uri $uri/ /index.html;
+    #web_path from mainsail static files
+    root /home/pi/mainsail;
+
+    index index.html;
+    server_name _;
+
+    proxy_request_buffering off;
+
+    location / {
+        try_files $uri $uri/ /index.html;
     }
 
     location = /index.html {
         add_header Cache-Control "no-store, no-cache, must-revalidate";
-    }
-
-    location /websocket {
-        proxy_pass http://apiserver/websocket;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection $connection_upgrade;
-        proxy_set_header Host $http_host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_read_timeout 86400;
-    }
-
+    }
+
+    location /websocket {
+        proxy_pass http://apiserver/websocket;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $connection_upgrade;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_read_timeout 86400;
+    }
+
     location ~ ^/(printer|api|access|machine|server)/ {
         proxy_pass http://apiserver$request_uri;
         proxy_set_header Host $http_host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Scheme $scheme;
-    }
-	
-    location /webcam/ {
-        proxy_pass http://mjpgstreamer/;
-    }
-}
+    }
+	
+    location /webcam/ {
+        proxy_pass http://mjpgstreamer/;
+    }
+}

src/modules/mjpgstreamer/start_chroot_script

@@ -19,7 +19,7 @@ unpack /filesystem/boot /boot
 WEBCAM_USER=webcam
 
 apt update
-apt install -y git cmake
+apt install -y --allow-downgrades git cmake=3.13.4-1 cmake-data=3.13.4-1
 cd /home/pi
   #mjpg-streamer
   if [ "$MJPGSTREAMER_INCLUDE_MJPGSTREAMER" == "yes" ]