Use the squeezed instead of Apache for the web page serving

Author: David Norman

controller/scripts/squeezed

@@ -0,0 +1,35 @@
+#!/bin/sh
+# Start/stop the squeezelite daemon.
+#
+### BEGIN INIT INFO
+# Provides:          squeezed
+# Required-Start:    $squeezelite
+# Required-Stop:     
+# Should-Start:      
+# Should-Stop:       
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Squeezebox server proxy
+# Description:       An HTTP proxy for an external squeezebox server
+### END INIT INFO
+
+PATH=/sbin
+DESC="squeezed daemon"
+NAME=squeezed
+DAEMON=/usr/local/bin/squeezed
+SCRIPTNAME=/etc/init.d/"$NAME"
+
+test -f $DAEMON || exit 0
+
+. /lib/lsb/init-functions
+
+case "$1" in
+start)	start-stop-daemon --start --quiet --background --oknodo --name $NAME --exec $DAEMON
+	;;
+stop)	start-stop-daemon --stop --quiet --oknodo --name $NAME
+        ;;
+*)	log_action_msg "Usage: /etc/init.d/squeezed {start|stop}"
+        exit 2
+        ;;
+esac
+exit 0

controller/src/squeezed

@@ -2,13 +2,10 @@
 
 import requests
 import cherrypy
-import cherrypy_cors
 import json
 import socket
 import sys
 
-cherrypy_cors.install()
-
 squeeze_player = ""
 
 def get_ip_address():
@@ -20,25 +17,31 @@ def squeeze_request(params):
     js = {"id":1,"method":"slim.request","params":[squeeze_player,params]}
     return requests.post('http://192.168.0.101:9001/jsonrpc.js', data=json.dumps(js)).json()['result']
 
-class SqueezeServerService(object):
+class Root(object):
+    exposed = True
+
+class Api(object):
     exposed = True
 
     @cherrypy.tools.json_out()
     @cherrypy.tools.json_in()
     def POST(self):
         return squeeze_request(cherrypy.request.json)
 
-    @cherrypy_cors.tools.preflight(allowed_methods=["POST"])
-    def OPTIONS(self):
-        pass
-
 if __name__ == '__main__':
-    conf = {
+    conf_api = {
         '/': {
             'request.dispatch': cherrypy.dispatch.MethodDispatcher(),
             'tools.response_headers.on': True,
             'tools.response_headers.headers': [('Content-Type', 'application/json')],
-            'cors.expose.on': True,
+        }
+    }
+
+    conf_root = {
+        '/': {
+            'tools.staticdir.on': True,
+            'tools.staticdir.dir': "/var/www",
+            'tools.staticdir.index': "index.html"
         }
     }
 
@@ -60,7 +63,11 @@ if __name__ == '__main__':
         sys.exit(0)
 
     cherrypy.server.socket_host = "0.0.0.0"
-    cherrypy.server.socket_port = 3000
+    cherrypy.server.socket_port = 80
+
+    cherrypy.tree.mount(Root(), '/', conf_root)
+    cherrypy.tree.mount(Api(), '/api', conf_api)
 
-    cherrypy.quickstart(SqueezeServerService(), '/', conf)
+    cherrypy.engine.start()
+    cherrypy.engine.block()
 

web/src/js/slim-client.js

@@ -1,7 +1,7 @@
 function SlimClient($http, $location, serverStatus) {
 
     var slimRequest = function(data) {
-        return $http.post("http://" + $location.host() + ":3000/", data).
+        return $http.post("http://" + $location.host() + "/api", data).
             success(function(_, status) {
                 serverStatus.available = true;
             }).