-#rm -r /tmp/apache-websocket
-#cd /tmp && git clone https://github.com/disconnect/apache-websocket
-#cd apache-websocket && apxs2 -i -a -c mod_websocket.c
-#sh /usr/share/doc/apache2/examples/setup-instance websockets
-#a2dismod websocket
-#cp ${SITKACONF}/files/etc/apache2-websockets/apache2.conf/${HOSTNAME} /etc/apache2-websockets/apache2.conf
-#cp ${SITKACONF}/files/etc/apache2-websockets/envvars/${HOSTNAME} /etc/apache2-websockets/envvars
-
-#/etc/init.d/apache2-websockets start
+if [[ ! -n "$SKIP_WEBSOCKETS" ]] ; then
+ rm -r /tmp/apache-websocket
+ rm -r /etc/apache2-websockets /etc/init.d/apache2-websockets /usr/local/sbin/*-websockets /var/log/apache2-websockets/ /etc/logrotate.d/apache2-websockets
+ #cd /tmp && git clone https://github.com/disconnect/apache-websocket
+ cd /tmp && git clone https://github.com/jchampio/apache-websocket
+ cd apache-websocket && apxs2 -i -a -c mod_websocket.c
+ sh /usr/share/doc/apache2/examples/setup-instance websockets
+ a2dismod websocket
+ cp ${SITKACONF}/files/etc/apache2-websockets/apache2.conf/${HOSTNAME} /etc/apache2-websockets/apache2.conf
+ sed -i "s|__THISHOST__|${THISHOST}|g" /etc/apache2-websockets/apache2.conf
+ cp ${SITKACONF}/files/etc/apache2-websockets/envvars/${HOSTNAME} /etc/apache2-websockets/envvars