Finalized authentication and daemon support

README.md

@@ -10,45 +10,47 @@ Installation
 
 Clone the repository to where you'd like (in the example I use the home folder ~)
 
-    `
+
     cd ~
     git clone https://github.com/acabey/cloud9-vnc.git
-    `
+
 
 Enter the repository sub-directory
 
-    `cd cloud9-vnc/`
+    cd cloud9-vnc/
 
 Run the install script with privileges
 
-    `sudo ./install.sh`
+    sudo ./install.sh
 
 Clean up installation directory
 
-    `rm -rf ./`
+    rm -rf ./
 
 Uninstallation
 --------------
 
 Run the uninstallation script with privileges
 
-    `sudo /opt/c9vnc/uninstall.sh`
+    bash
+        sudo /opt/c9vnc/uninstall.sh
+
 
 Running
 -------
 
 Use the custom C9 runner
 
-    `Run > Run With > C9vnc`
+    Run > Run With > C9vnc
 
 Run the start script symlinked into your /usr/local/bin
 
-    `
+
     c9vnc
 
     Usage: c9vnc <args>
        -h          Print this message
        -f          Run in the foreground
        -k          Kill running daemon
     No arguments will try to start daemon process
-    `
+

run.sh

@@ -41,6 +41,9 @@ function daemonStop {
     supervisorctl stop fluxbox
     supervisorctl stop x11vnc
     supervisorctl stop xvfb
+
+    #If that fails, killall
+    killall Xvfb x11vnc websockify supervisord
 }
 
 # No arguments, default to starting the daemon

supervisord.conf

@@ -1,8 +1,11 @@
 [unix_http_server]
 file=/tmp/supervisor.sock
 
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
 [supervisorctl]
-file=/tmp/supervisor.sock
+serverurl=unix:///tmp/supervisor.sock
 
 [supervisord]
 nodaemon=false
@@ -23,4 +26,8 @@ autorestart=true
 
 [program:fluxbox]
 command=fluxbox
-autorestart=true
+autorestart=true
+
+[group:c9vnc]
+programs=xvfb,x11vnc,novnc,fluxbox
+priority=999