+ added PID support

+ mineos initscript
improved presentation of login page

Author: hexparrot

login.html

@@ -66,14 +66,14 @@
                                 <!--/ END Logo -->
 
                                 <!-- Avatar -->
-                                <div class="avatar">
-                                    <h5 align="center">Admin Login</h5>
+                                <div class="">
+                                    <h5 align="center">Web User Interface Login</h5>
                                 </div><!--/ Avatar -->
 
                                 <!-- Username -->
                                 <div class="control-group">
                                     <div class="controls">
-                                        <input type="text" name="username" placeholder="Username" class="span12"><i class="icon-user input-icon"></i>
+                                        <input type="text" name="username" autocomplete="off" placeholder="Username" class="span12"><i class="icon-user input-icon"></i>
                                     </div>
                                 </div><!--/ Username -->
 
@@ -87,19 +87,24 @@ <h5 align="center">Admin Login</h5>
                                 <!-- Checkbox -->
                                 <div class="control-group">
                                     <div class="controls">
-                                        <label class="checkbox styled">
-                                            <input type="checkbox" name="hide"> Hide password
-                                        </label>
+                                        <span>
+                                            <label class="checkbox styled pull-left">
+                                                <input type="checkbox" name="hide"> Hide password 
+                                            </label>
+                                            <a class="pull-left" href="http://www.nngroup.com/articles/stop-password-masking/">&nbsp;(?)</a>
+                                        </span>
+
                                     </div>
                                 </div><!--/ Checkbox -->
-
                             </div>
                             <!-- Form Action -->
                             <!-- Place out form `.body-inner` -->
                             <div class="form-actions">
                                 <button type="submit" class="btn btn-primary span12">Login</button>
                             </div>
                             <!--/ Form Action -->
+
+                            <p align="center">The web user interface authenticates on your SSH username/password.</p>
                         </section>
                     </form>
                     <!--/ END Login Widget Form -->

mineos

@@ -0,0 +1,76 @@
+#!/bin/sh
+
+### BEGIN INIT INFO
+# Provides:          mineos
+# Required-Start:    $all
+# Required-Stop:     $network
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: MineOS webui
+# Description:       A web-based administration interface for Unix systems
+### END INIT INFO
+
+NAME=mineos
+PIDFILE=/var/run/mineos.pid
+SERVER=/usr/games/minecraft/server.py
+DATAPATH=/var/games/minecraft
+
+set -e
+. /lib/lsb/init-functions
+
+case "$1" in
+    'start')
+        if [ -s $PIDFILE ]; then
+            kill -0 `cat $PIDFILE` >/dev/null 2>&1
+            if [ "$?" = "0" ]; then
+                echo "$NAME (pid `cat $PIDFILE`) is already running."
+                RETVAL=0
+            else
+                rm -- $PIDFILE
+                log_begin_msg "Starting $NAME... "
+                python $SERVER --daemon -d $DATAPATH >/dev/null 2>&1 </dev/null
+                RETVAL=$?
+                log_action_end_msg $RETVAL
+            fi
+        else
+            log_begin_msg "Starting $NAME... "
+            python $SERVER --daemon -d $DATAPATH >/dev/null 2>&1 </dev/null
+            RETVAL=$?
+            log_action_end_msg $RETVAL
+        fi
+        ;;
+
+    'stop')
+        if [ -s $PIDFILE ]; then
+            log_begin_msg "Stopping $NAME... "
+            kill -s INT `cat $PIDFILE` >/dev/null 2>&1
+            rm -- $PIDFILE
+            RETVAL=$?
+            log_action_end_msg $RETVAL
+        else
+            echo "$NAME is not running."
+        fi
+        ;;
+
+    'status')
+        if [ -s $PIDFILE ]; then
+            kill -0 `cat $PIDFILE` >/dev/null 2>&1
+            if [ "$?" = "0" ]; then
+                echo "$NAME (pid `cat $PIDFILE`) is running."
+                RETVAL=0
+            else
+                echo "$NAME is stopped."
+                RETVAL=1
+            fi
+        else
+            echo "$NAME is stopped."
+            RETVAL=1
+        fi
+        ;;
+    *)
+        echo "Usage: $0 { start | stop }"
+        RETVAL=1
+        ;;
+esac
+exit $RETVAL
+

server.py

@@ -49,6 +49,10 @@ def check_interval(self):
                         action='store_true',
                         default=False,
                         help='run server as a daemon')
+    parser.add_argument('--nopid',
+                        action='store_true',
+                        default=False,
+                        help='do not use a PID file')
     parser.add_argument('-s',
                         dest='cert_files',
                         help='certificate files: /etc/ssl/certs/cert.crt,/etc/ssl/certs/cert.key',
@@ -133,6 +137,15 @@ def check_interval(self):
         from cherrypy.process.plugins import Daemonizer
         Daemonizer(cherrypy.engine).subscribe()
 
+    if args.nopid is False:
+        from cherrypy.process.plugins import PIDFile
+        PIDFile(cherrypy.engine, '/var/run/mineos.pid').subscribe()
+
+    if os.path.isfile('/var/run/mineos.pid'):
+        import sys
+        print 'MineOS instance already running (PID found)'
+        sys.exit(1)
+
     minute_crontab = cherrypy.process.plugins.Monitor(cherrypy.engine, cron(base_dir).check_interval, 60)
     minute_crontab.subscribe()