diff --git a/README.md b/README.md index ccb2b89..62bd29c 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,13 @@ ## EDDN - Elite: Dangerous Data Network -The **Elite: Dangerous Data Network** is a system for willing Commanders to share dynamic data about the galaxy with others. By pooling data in a common format, tools and analyses can be produced that add an even greater depth and vibrancy to the in-game universe. +The **Elite: Dangerous Data Network** is a system for willing Commanders to share dynamic data about the galaxy with others. +By pooling data in a common format, tools and analyses can be produced that add an even greater depth and vibrancy to the in-game universe. -EDDN is not run by or affiliated with [Frontier Developments](http://www.frontier.co.uk/). Hosting has been very generously provided by [Vivio Technologies](https://www.viviotech.net/). +EDDN is not run by or affiliated with [Frontier Developments](http://www.frontier.co.uk/). -### [Using EDDN](https://github.com/jamesremuscat/EDDN/wiki) +Hosting has been very generously provided by [Vivio Technologies](https://www.viviotech.net/), until 2017. +Hosting is now provided by the [EDCD community](https://edcd.github.io/). -### [EDDN Status](http://eddn-gateway.elite-markets.net/) +### [Using EDDN](https://github.com/EDSM-NET/EDDN/wiki) + +### [EDDN Status](https://eddn.edcd.io/) diff --git a/contrib/eddn-gateway b/contrib/eddn-gateway deleted file mode 100644 index 4706942..0000000 --- a/contrib/eddn-gateway +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/sh - -### BEGIN INIT INFO -# Provides: eddn-gateway -# Required-Start: $network -# Required-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -### END INIT INFO - -# ------------------------------------------------------------------------- -#    Based on: -#    Copyright (C) <2011>  - ppacory-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org -# Modified by James Muscat -#    This program is free software: you can redistribute it and/or modify -#    it under the terms of the GNU General Public License as published by -#    the Free Software Foundation, either version 3 of the License, or -#    (at your option) any later version. - -#    This program is distributed in the hope that it will be useful, -#    but WITHOUT ANY WARRANTY; without even the implied warranty of -#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the -#    GNU General Public License for more details. - -#    You should have received a copy of the GNU General Public License -#    along with this program.  If not, see . -# ------------------------------------------------------------------------- - - -MESSAGEDIR=/var/log/eddn-gateway -MESSAGELOG=/var/log/eddn-gateway/gateway.log -PID=/var/run/eddn-gateway.pid -EXECUTABLE=/path/to/eddn-gateway -CMDLINE="" - - -# Check the script is being run by root user -if [ "$(id -u)" != "0" ]; then -  echo 1>&2 "ERROR: The $0 script must be run as root" -  exit 1 -fi - -# Create the PID File -touch $PID - -case "$1" in - start) - # create the log directory if not exist - [ ! -d "$MESSAGEDIR" ] && mkdir -p "$MESSAGEDIR" - - echo "Starting EDDN gateway" - # test if not already running - if [ ! -f "/proc/$(cat $PID)/exe" ]; then - $EXECUTABLE "$CMDLINE" > "$MESSAGELOG" 2>&1 & - echo $!>"$PID" - else - echo "EDDN gateway already running" - fi - ;; - stop) - echo "Stopping EDDN gateway" - # test if running - if [ -f "/proc/$(cat $PID)/exe" ]; then - kill -9 "$(cat $PID)" - rm -rf "$PID" - else - echo "EDDN gateway already stopped" - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/contrib/init.d/eddn-gateway b/contrib/init.d/eddn-gateway new file mode 100644 index 0000000..3b87b73 --- /dev/null +++ b/contrib/init.d/eddn-gateway @@ -0,0 +1,53 @@ +#!/bin/sh + +### BEGIN INIT INFO +# Provides: eddn-gateway +# Required-Start: $network +# Required-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +### END INIT INFO + +NAME=eddn-gateway +DESC="eddn-gateway" +PIDFILE="/var/run/${NAME}.pid" +LOGFILE="/var/log/eddn/${NAME}.log" + +DAEMON="/usr/local/bin/${NAME}" + +EXEC_AS_USER="root" + +START_OPTS="--start --background --make-pidfile --pidfile ${PIDFILE} --chuid ${EXEC_AS_USER} --exec ${DAEMON}" +STOP_OPTS="--stop --pidfile ${PIDFILE}" + +test -x $DAEMON || exit 0 + +set -e + +case "$1" in +start) + echo -n "Starting ${DESC}: " + start-stop-daemon $START_OPTS >> $LOGFILE + echo "$NAME." + ;; +stop) + echo -n "Stopping $DESC: " + start-stop-daemon $STOP_OPTS + echo "$NAME." + rm -f $PIDFILE + ;; +restart|force-reload) + echo -n "Restarting $DESC: " + start-stop-daemon $STOP_OPTS + sleep 1 + start-stop-daemon $START_OPTS >> $LOGFILE + echo "$NAME." + ;; +*) + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 \ No newline at end of file diff --git a/contrib/init.d/eddn-monitor b/contrib/init.d/eddn-monitor new file mode 100644 index 0000000..2d73441 --- /dev/null +++ b/contrib/init.d/eddn-monitor @@ -0,0 +1,53 @@ +#!/bin/sh + +### BEGIN INIT INFO +# Provides: eddn-monitor +# Required-Start: $network +# Required-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +### END INIT INFO + +NAME=eddn-monitor +DESC="eddn-monitor" +PIDFILE="/var/run/${NAME}.pid" +LOGFILE="/var/log/eddn/${NAME}.log" + +DAEMON="/usr/local/bin/${NAME}" + +EXEC_AS_USER="root" + +START_OPTS="--start --background --make-pidfile --pidfile ${PIDFILE} --chuid ${EXEC_AS_USER} --exec ${DAEMON}" +STOP_OPTS="--stop --pidfile ${PIDFILE}" + +test -x $DAEMON || exit 0 + +set -e + +case "$1" in +start) + echo -n "Starting ${DESC}: " + start-stop-daemon $START_OPTS >> $LOGFILE + echo "$NAME." + ;; +stop) + echo -n "Stopping $DESC: " + start-stop-daemon $STOP_OPTS + echo "$NAME." + rm -f $PIDFILE + ;; +restart|force-reload) + echo -n "Restarting $DESC: " + start-stop-daemon $STOP_OPTS + sleep 1 + start-stop-daemon $START_OPTS >> $LOGFILE + echo "$NAME." + ;; +*) + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 \ No newline at end of file diff --git a/contrib/init.d/eddn-relay b/contrib/init.d/eddn-relay new file mode 100644 index 0000000..24b3d79 --- /dev/null +++ b/contrib/init.d/eddn-relay @@ -0,0 +1,53 @@ +#!/bin/sh + +### BEGIN INIT INFO +# Provides: eddn-relay +# Required-Start: $network +# Required-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +### END INIT INFO + +NAME=eddn-relay +DESC="eddn-relay" +PIDFILE="/var/run/${NAME}.pid" +LOGFILE="/var/log/eddn/${NAME}.log" + +DAEMON="/usr/local/bin/${NAME}" + +EXEC_AS_USER="root" + +START_OPTS="--start --background --make-pidfile --pidfile ${PIDFILE} --chuid ${EXEC_AS_USER} --exec ${DAEMON}" +STOP_OPTS="--stop --pidfile ${PIDFILE}" + +test -x $DAEMON || exit 0 + +set -e + +case "$1" in +start) + echo -n "Starting ${DESC}: " + start-stop-daemon $START_OPTS >> $LOGFILE + echo "$NAME." + ;; +stop) + echo -n "Stopping $DESC: " + start-stop-daemon $STOP_OPTS + echo "$NAME." + rm -f $PIDFILE + ;; +restart|force-reload) + echo -n "Restarting $DESC: " + start-stop-daemon $STOP_OPTS + sleep 1 + start-stop-daemon $START_OPTS >> $LOGFILE + echo "$NAME." + ;; +*) + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 \ No newline at end of file diff --git a/contrib/monitor/index.html b/contrib/monitor/index.html index 7673e50..3a195a2 100644 --- a/contrib/monitor/index.html +++ b/contrib/monitor/index.html @@ -403,8 +403,8 @@ - - + + diff --git a/contrib/monitor/js/eddn.js b/contrib/monitor/js/eddn.js index b8edc64..dbc4977 100644 --- a/contrib/monitor/js/eddn.js +++ b/contrib/monitor/js/eddn.js @@ -1,16 +1,19 @@ var updateInterval = 60000, - monitorEndPoint = 'http://eddn-gateway.elite-markets.net:9091/', + monitorEndPoint = 'https://eddn.edcd.io:9091/', - gatewayBottlePort = 8080, + //gatewayBottlePort = 8080, + gatewayBottlePort = 4430, relayBottlePort = 9090, gateways = [ - 'eddn-gateway.elite-markets.net' + 'eddn.edcd.io', + //'eddn-gateway.elite-markets.net' ], // Must find a way to bind them to monitor relays = [ - 'eddn-relay.elite-markets.net' + 'eddn.edcd.io', + //'eddn-relay.elite-markets.net' ]; // Must find a way to bind them to monitor var stats = { @@ -539,7 +542,7 @@ var start = function(){ gateway = gateway.replace(':8500', ''); $("select[name=gateways]").append($('