Go back to copying in the /etc/init.d/xvfb script since the Travis workers apparently don't have it anymore.

config/ci/before-travis.sh

@@ -5,12 +5,13 @@ export RUBY_HEAP_SLOTS_GROWTH_FACTOR=1
 export RUBY_GC_MALLOC_LIMIT=1000000000
 export RUBY_HEAP_FREE_MIN=500000
 
-
 # Start xvfb in preparation for cucumber & jasmine
+echo "Starting Xvfb"
+sudo cp config/ci/xvfb /etc/init.d/xvfb
 sh -e /etc/init.d/xvfb start
 
 # Regenerate css files
-echo "Regenerate CSS files"
+echo "Regenerating CSS files"
 bundle exec sass -q --update public/stylesheets/sass/:public/stylesheets/
 
 # Create a database.yml for the right database

config/ci/xvfb

@@ -0,0 +1,28 @@
+# Copyright (c) 2010, Diaspora Inc.  This file is
+# licensed under the Affero General Public License version 3 or later.  See
+# the COPYRIGHT file.
+
+XVFB=/usr/bin/Xvfb
+XVFBARGS=":99 -ac -screen 0 1024x768x16"
+PIDFILE=/tmp/cucumber_xvfb_99.pid
+case "$1" in
+  start)
+    echo -n "Starting virtual X frame buffer: Xvfb"
+    /sbin/start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile --background --exec $XVFB -- $XVFBARGS
+    echo "."
+    ;;
+  stop)
+    echo -n "Stopping virtual X frame buffer: Xvfb"
+    /sbin/start-stop-daemon --stop --quiet --pidfile $PIDFILE
+    rm -f $PIDFILE
+    echo "."
+    ;;
+  restart)
+    $0 stop
+    $0 start
+    ;;
+  *)
+  echo "Usage: /etc/init.d/xvfb {start|stop|restart}"
+  exit 1
+esac
+exit 0