Merge branch 'dev'

TurtleRover · Sep 7, 2018 · 8ad33ef · 8ad33ef
2 parents 28b1748 + d70ded7
commit 8ad33ef
Show file tree

Hide file tree

Showing 38 changed files with 307 additions and 2,996 deletions.
diff --git a/README.md b/README.md
@@ -28,10 +28,7 @@
 
 **Web Application** --_WebSockets_--> **Server** --_Serial_--> **Firmware**
 
-Also static files are served by Apache web server.
-
 ## Requirements
- * Apache web server to serve static files
  * uv4l to send video stream
  * Working UART
  * Python requirements
@@ -41,7 +38,7 @@ Also static files are served by Apache web server.
  * `sudo apt install ./turtlerover-tcs_*_all.deb`
 
 ## How to run
- * Open in browser http://10.0.0.1/client/dist (for more detailed network configuration look at [Turtle OS repo](https://github.com/TurtleRover/turtleos))
+ * Open in browser http://10.0.0.1/ (for more detailed network configuration look at [Turtle OS repo](https://github.com/TurtleRover/turtleos))
 
 ## How to build
  * Run `yarn install`

diff --git a/apache_conf/apache2.conf b/apache_conf/apache2.conf
diff --git a/apache_conf/sites-available/000-default.conf b/apache_conf/sites-available/000-default.conf