diff --git a/pkg/fedora/diaspora-setup b/pkg/fedora/diaspora-setup
index 0214e419aa058ff03ae0944e95146f662cf0ad33..01f0d3cdcbfd2b1690be1ae497533abfc1af59e3 100755
--- a/pkg/fedora/diaspora-setup
+++ b/pkg/fedora/diaspora-setup
@@ -24,6 +24,8 @@ cd /usr/share/diaspora/master
test -e config/app_config.yml ||
cp config/app_config.yml.example config/app_config.yml
+sed -i '/socket_pidfile:/s|:.*|: /var/run/diaspora/diaspora-wsd.pid|' \
+ config/app_config.yml
if rake db:seed:dev; then
echo "Database config OK, new user tom/evankorth in place"
@@ -39,11 +41,10 @@ else
exit 1
fi
+# %attr(0777, diaspora, diaspora) doesn't work in specfile due to umask 022.
+chmod 777 /var/lib/diaspora/uploads
chown -R diaspora /var/log/diaspora
-sed -i '/socket_pidfile:/s|:.*|: /var/run/diaspora/diaspora-wsd.pid|' \
- config/app_config.yml
-
hostname=$( awk '/pod_url:/ { print $2; exit }' <config/app_config.yml)
if [ -n "$arg_hostname" ]; then
diff --git a/pkg/fedora/diaspora-wsd b/pkg/fedora/diaspora-wsd
index d4ad5395330179406fc7c4cc547daf2175c7a430..f99492e80a1a1b71fa90cc878a91fd3c73ea7a4f 100755
--- a/pkg/fedora/diaspora-wsd
+++ b/pkg/fedora/diaspora-wsd
@@ -35,7 +35,7 @@ prog="Diaspora websocket server"
exec="script/websocket_server.rb"
pidfile="/var/run/diaspora/diaspora-wsd"
lockfile="/var/lock/subsys/diaspora-wsd"
-logfile="/var/log/diaspora/diaspora-wsd.log"
+logfile=/var/log/diaspora-wsd.log
[ -n "$OPTIONS" ] && OPTIONS=" $OPTIONS"
ruby_cmd="ruby -C $PWD $exec$OPTIONS"
diff --git a/pkg/ubuntu/diaspora-install b/pkg/ubuntu/diaspora-install
index 0685aa3ae889c26591c063510a8cfc7f67ea7eb9..daaf33b5477f908ee58e5abc07a0764c69621abc 100755
--- a/pkg/ubuntu/diaspora-install
+++ b/pkg/ubuntu/diaspora-install
@@ -30,7 +30,7 @@ sed -i '/BUNDLE_PATH/s|:.*|: /usr/lib/diaspora-bundle/bundle|' \
cp master/GNU-AGPL-3.0 master/COPYRIGHT master/README.md master/AUTHORS .
cp master/config/app_config.yml.example ./app_config.yml
-cp master/pkg/ubuntu/diaspora-wsd.conf /etc/init
+cp master/pkg/ubuntu/diaspora-wsd /etc/init.d
sed -i '/^cd /s|.*|cd /usr/share/diaspora/master|' /etc/init.d/diaspora-wsd
diff --git a/pkg/ubuntu/diaspora-setup b/pkg/ubuntu/diaspora-setup
index 32293a2d27170a09de8eeefed8f39a651ced4cc1..305527d28bc17f72a24665a60e75320ebd33d1b3 100755
--- a/pkg/ubuntu/diaspora-setup
+++ b/pkg/ubuntu/diaspora-setup
@@ -26,6 +26,8 @@ cd /usr/share/diaspora/master
test -e config/app_config.yml ||
cp config/app_config.yml.example config/app_config.yml
+sed -i '/socket_pidfile:/s|:.*|: /var/run/diaspora/diaspora-wsd.pid|' \
+ config/app_config.yml
if rake db:seed:dev; then
echo "Database config OK, new user tom/evankorth in place"
@@ -43,11 +45,9 @@ else
exit 1
fi
+chmod 777 /var/lib/diaspora/uploads
chown -R diaspora /var/log/diaspora
-sed -i '/socket_pidfile:/s|:.*|: /var/run/diaspora/diaspora-wsd.pid|' \
- config/app_config.yml
-
hostname=$( awk '/pod_url:/ { print $2; exit }' <config/app_config.yml)
if [ -n "$arg_hostname" ]; then
diff --git a/pkg/ubuntu/diaspora-wsd b/pkg/ubuntu/diaspora-wsd
new file mode 100755
index 0000000000000000000000000000000000000000..0e8d08f2030d2cf992b7e53351005ff9847ef1e4
--- /dev/null
+++ b/pkg/ubuntu/diaspora-wsd
@@ -0,0 +1,154 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides: diaspora-wsd
+# Required-Start: $remote_fs $syslog
+# Required-Stop: $remote_fs $syslog
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: diaspora websocket daemon
+# Description: The diaspora websocket service provider, normally
+# listening on port 8080
+### END INIT INFO
+
+# Author: Alec leamas <leamas.alec@gmail.com>
+
+PATH=/bin:/sbin:/usr/sbin:/usr/bin
+DESC="Websocket server for diaspora clients"
+NAME='diaspora-wsd'
+DAEMON='/usr/local/bin/bundle'
+DAEMON_ARGS=' exec ruby ./script/websocket_server.rb'
+PIDFILE=/var/run/diaspora/diaspora-wsd.pid
+SCRIPTNAME=/etc/init.d/diaspora-wsd
+
+cd /usr/share/diaspora/master
+
+[ -x "$DAEMON" ] || exit 0
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+. /lib/lsb/init-functions
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+ # Return
+ # 0 if daemon has been started
+ # 1 if daemon was already running
+ # 2 if daemon could not be started
+ [ -f $PIDFILE ] && {
+ pid=$( cat $PIDFILE)
+ name=$( ps -p "$pid" -o comm= 2> /dev/null) || :
+ [ "$name" = "ruby" ] && return 1
+ }
+ start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON \
+ --chdir $PWD -- $DAEMON_ARGS \
+ || return 2
+ return 0
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+ # Return
+ # 0 if daemon has been stopped
+ # 1 if daemon was already stopped
+ # 2 if daemon could not be stopped
+ # other if a failure occurred
+ start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE \
+ --name $NAME --chdir $PWD
+ RETVAL="$?"
+ [ "$RETVAL" = 2 ] && return 2
+ # Wait for children to finish too if this is a daemon that forks
+ # and if the daemon is only ever run from this initscript.
+ # If the above conditions are not satisfied then add some other code
+ # that waits for the process to drop all resources that could be
+ # needed by services started subsequently. A last resort is to
+ # sleep for some time.
+ start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --chdir $PWD \
+ --exec $DAEMON
+ [ "$?" = 2 ] && return 2
+ # Many daemons don't delete their pidfiles when they exit.
+ rm -f $PIDFILE
+ return "$RETVAL"
+}
+
+#
+# Function that sends a SIGHUP to the daemon/service
+#
+do_reload() {
+ #
+ # If the daemon can reload its configuration without
+ # restarting (for example, when it is sent a SIGHUP),
+ # then implement that here.
+ #
+ start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --chdir $PWD \
+ --name $NAME
+ return 0
+}
+
+case "$1" in
+ start)
+ [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+ do_start
+ case "$?" in
+ 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+ 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+ esac
+ ;;
+
+ stop)
+ [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+ do_stop
+ case "$?" in
+ 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+ 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+ esac
+ ;;
+
+ status)
+ status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+ ;;
+
+ #reload|force-reload)
+ #
+ # If do_reload() is not implemented then leave this commented out
+ # and leave 'force-reload' as an alias for 'restart'.
+ #
+ #log_daemon_msg "Reloading $DESC" "$NAME"
+ #do_reload
+ #log_end_msg $?
+ #;;
+
+ restart|force-reload)
+ log_daemon_msg "Restarting $DESC" "$NAME"
+ do_stop
+ case "$?" in
+ 0|1)
+ do_start
+ case "$?" in
+ 0) log_end_msg 0 ;;
+ 1) log_end_msg 1 ;; # Old process is still running
+ *) log_end_msg 1 ;; # Failed to start
+ esac
+ ;;
+ *)
+ # Failed to stop
+ log_end_msg 1
+ ;;
+ esac
+ ;;
+
+ *) echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+ exit 3
+ ;;
+esac
+
+:
diff --git a/pkg/ubuntu/diaspora-wsd.conf b/pkg/ubuntu/diaspora-wsd.conf
deleted file mode 100644
index 95d78118e22a9e2aec366fb3d1b21159f5486671..0000000000000000000000000000000000000000
--- a/pkg/ubuntu/diaspora-wsd.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# Ubuntu upstart file at /etc/init/diaspora-wsd.conf
-
-start on runlevel [5]
-stop on runlevel [06]
-
-export fork
-
-script
- if [ -f /etc/default/diaspora ]; then
- . /etc/default/diaspora;
- fi;
- cd /usr/share/diaspora/master;
- start-stop-daemon --start \
- --chuid diaspora:diaspora \
- --chdir $PWD \
- --exec "/usr/local/bin/bundle" \
- -- exec ruby -C $PWD script/websocket_server.rb;
-
-end script
diff --git a/script/websocket_server.rb b/script/websocket_server.rb
index 4dddca11e126152f5d31f666ecb9b923cc99cebc..64f6ddf8a4f290d1d7f9597415f6c2990be6e918 100644
--- a/script/websocket_server.rb
+++ b/script/websocket_server.rb
@@ -25,6 +25,7 @@ def write_pidfile
end
end
+
CHANNEL = Magent::GenericChannel.new('websocket')
def process_message
if CHANNEL.queue_count > 0