image: Change monkey startup

builder/assets/monkey.service

@@ -0,0 +1,9 @@
+[Unit]
+Description=Monkey web-server
+
+[Service]
+ExecStart=/usr/sbin/monkey
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target

builder/image-build.sh

@@ -87,6 +87,7 @@ ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/index.h
 # Butterfly
 ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/butterfly.service' '/root/'
 ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/butterfly.socket' '/root/'
+${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} copy ${SCRIPTS_DIR}'/assets/monkey.service' '/root/'
 # software install
 ${BUILDER_DIR}/image-chroot.sh ${IMAGE_PATH} exec ${SCRIPTS_DIR}'/image-software.sh'
 # network setup

builder/image-software.sh

@@ -119,7 +119,9 @@ systemctl enable butterfly.socket
 
 echo_stamp "Setup Monkey"
 mv /etc/monkey/sites/default /etc/monkey/sites/default.orig
-ln -s /root/monkey-clever /etc/monkey/sites/default
+mv /root/monkey-clever /etc/monkey/sites/default
+ln -s /root/monkey.socket /lib/systemd/system/
+systemctl enable monkey.socket
 
 echo_stamp "Add .vimrc"
 cat << EOF > /home/pi/.vimrc

clever/launch/clever.launch

@@ -20,10 +20,6 @@
         <arg name="viz" value="true"/>
     </include>
 
-
-    <!-- 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 -->
     <node name="web_video_server" pkg="web_video_server" type="web_video_server" if="$(arg web_video_server)" required="false" respawn="true" respawn_delay="5"/>
 

clever/src/monkey

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-exec /usr/sbin/monkey --port 80 --workers 1