From e13ca40a7581308063e22e747d0b80fdc38ef2fc Mon Sep 17 00:00:00 2001
From: Artem Smirnov <urpylka@gmail.com>
Date: Tue, 2 Oct 2018 14:17:19 +0300
Subject: [PATCH] image: Fix monkey

---
 builder/assets/monkey-clever |  2 +-
 builder/image-build.sh       |  2 +-
 builder/image-software.sh    |  3 ++-
 clever/launch/clever.launch  |  2 +-
 clever/src/monkey            |  2 +-
 clever/static/index.html     | 13 -------------
 6 files changed, 6 insertions(+), 18 deletions(-)
 delete mode 100644 clever/static/index.html

diff --git a/builder/assets/monkey-clever b/builder/assets/monkey-clever
index 9856650a..112d990f 100644
--- a/builder/assets/monkey-clever
+++ b/builder/assets/monkey-clever
@@ -20,7 +20,7 @@
     # Example:
     #      DocumentRoot /home/krypton/htdocs
 
-    DocumentRoot /root/monkey-static
+    DocumentRoot /usr/share/monkey-static
 
     # Redirect:
     # ---------
diff --git a/builder/image-build.sh b/builder/image-build.sh
index bd409b57..cf1fb544 100755
--- a/builder/image-build.sh
+++ b/builder/image-build.sh
@@ -86,7 +86,7 @@ ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} exec ${SCRIPTS_DIR}'/image-init.sh'
 
 # Monkey
 ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/monkey-clever' '/root/'
-${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/index.html' '/root/monkey-static/'
+${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/index.html' '/usr/share/monkey-static/'
 
 # Butterfly
 ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/butterfly.service' '/root/'
diff --git a/builder/image-software.sh b/builder/image-software.sh
index 763afeea..b2ab79d0 100755
--- a/builder/image-software.sh
+++ b/builder/image-software.sh
@@ -96,7 +96,8 @@ ln -s /root/butterfly.socket /lib/systemd/system/
 systemctl enable butterfly.socket
 
 echo_stamp "Setup Monkey"
-ln -s /root/monkey-clever /etc/monkey/sites/clever
+mv /etc/monkey/sites/default /etc/monkey/sites/default.orig
+ln -s /root/monkey-clever /etc/monkey/sites/default
 
 echo_stamp "Add .vimrc"
 cat << EOF > /home/pi/.vimrc
diff --git a/clever/launch/clever.launch b/clever/launch/clever.launch
index 998ef361..51dbc5fc 100644
--- a/clever/launch/clever.launch
+++ b/clever/launch/clever.launch
@@ -21,7 +21,7 @@
     </include>
 
 
-    <!-- web server, serving /home/pi/catkin_ws/src/clever/clever/static -->
+    <!-- web server, serving /usr/share/clever-static -->
     <node name="web_server" pkg="clever" type="monkey" output="screen" if="$(arg web_server)" respawn="true" respawn_delay="5"/>
 
     <!-- web video server -->
diff --git a/clever/src/monkey b/clever/src/monkey
index d1fd8ca2..ea5a5d7c 100755
--- a/clever/src/monkey
+++ b/clever/src/monkey
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-exec /home/pi/monkey/build/monkey --port 80 --workers 1
+exec /usr/sbin/monkey --port 80 --workers 1
diff --git a/clever/static/index.html b/clever/static/index.html
deleted file mode 100644
index 9c3074ca..00000000
--- a/clever/static/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<h1>CLEVER Drone Kit Tools</h1>
-
-<ul>
-	<!-- <li><a href="">View user reference</a> (<a href="http://clever.copterexpress.com">http://clever.copterexpress.com</a> snapshot)</li> -->
-	<li><a href="" id="wvs">View image topics</a> (<code>web_video_server</code>)</li>
-	<li><a href="" id="butterfly">Open web terminal</a> (<code>Butterfly</code>)</li>
-	<!-- <li><a href="viz.html">View 3D visualization</a> (<code>ros3djs</code>)</li> -->
-</ul>
-
-<script type="text/javascript">
-	document.querySelector("#wvs").href = location.origin + ':8080';
-	document.querySelector("#butterfly").href = location.origin + ':57575';
-</script>