diff --git a/opt/inverter/config.ini b/config.ini similarity index 100% rename from opt/inverter/config.ini rename to config.ini diff --git a/opt/inverter/create_rrd.php b/create_rrd.php similarity index 100% rename from opt/inverter/create_rrd.php rename to create_rrd.php diff --git a/opt/inverter/daemon.php b/daemon.php similarity index 100% rename from opt/inverter/daemon.php rename to daemon.php diff --git a/opt/inverter/data/twilight_2012.csv b/data/twilight_2012.csv similarity index 100% rename from opt/inverter/data/twilight_2012.csv rename to data/twilight_2012.csv diff --git a/opt/inverter/data/twilight_2013.csv b/data/twilight_2013.csv similarity index 100% rename from opt/inverter/data/twilight_2013.csv rename to data/twilight_2013.csv diff --git a/opt/inverter/data/twilight_2014.csv b/data/twilight_2014.csv similarity index 100% rename from opt/inverter/data/twilight_2014.csv rename to data/twilight_2014.csv diff --git a/opt/inverter/data/twilight_2015.csv b/data/twilight_2015.csv similarity index 100% rename from opt/inverter/data/twilight_2015.csv rename to data/twilight_2015.csv diff --git a/opt/inverter/data/twilight_2016.csv b/data/twilight_2016.csv similarity index 100% rename from opt/inverter/data/twilight_2016.csv rename to data/twilight_2016.csv diff --git a/etc/init.d/inverter b/etc/init.d/inverter deleted file mode 100644 index 5e65610..0000000 --- a/etc/init.d/inverter +++ /dev/null @@ -1,156 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: inverter.php -# Required-Start: $network -# Required-Stop: $network -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: -# Description: This file should be used to construct scripts to be -# placed in /etc/init.d. -### END INIT INFO - -# Author: <> -# - -# Do NOT "set -e" - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="" -NAME=inverter.php -DAEMON=/opt/inverter/inverter.php -DAEMON_ARGS="" -PIDFILE=/var/run/inverter/inverter.pid -SCRIPTNAME=/etc/init.d/inverter.php - -# Exit if the package is not installed -[ -x "$DAEMON" ] || exit 0 - -# Read configuration variable file if it is present -[ -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 - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ - || return 1 - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ - $DAEMON_ARGS \ - || return 2 - # Add code here, if necessary, that waits for the process to be ready - # to handle requests from services started subsequently which depend - # on this one. As a last resort, sleep for some time. -} - -# -# 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 - 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 --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 - 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 - ;; - #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 $? - #;; - status) - status_of_proc $DAEMON $NAME -p $PIDFILE - ;; - restart|force-reload) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - 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|restart|reload|force-reload|status}" >&2 - echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2 - exit 3 - ;; -esac - -: diff --git a/etc/logrotate.d/inverter b/etc/logrotate.d/inverter deleted file mode 100644 index f83030a..0000000 --- a/etc/logrotate.d/inverter +++ /dev/null @@ -1,10 +0,0 @@ -/var/log/inverter.log { - rotate 5 - compress - missingok - notifempty - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/inverter/inverter.pid 2>/dev/null` 2> /dev/null || true - endscript -} \ No newline at end of file diff --git a/opt/inverter/functions.php b/functions.php similarity index 100% rename from opt/inverter/functions.php rename to functions.php diff --git a/opt/inverter/inverter.php b/inverter.php similarity index 100% rename from opt/inverter/inverter.php rename to inverter.php diff --git a/opt/inverter/inverter.pl b/inverter.pl similarity index 100% rename from opt/inverter/inverter.pl rename to inverter.pl diff --git a/opt/inverter/pvoutput.php b/pvoutput.php similarity index 100% rename from opt/inverter/pvoutput.php rename to pvoutput.php diff --git a/opt/inverter/rrd.php b/rrd.php similarity index 100% rename from opt/inverter/rrd.php rename to rrd.php diff --git a/opt/inverter/weather.php b/weather.php similarity index 100% rename from opt/inverter/weather.php rename to weather.php diff --git a/opt/inverter/wunderground.php b/wunderground.php similarity index 100% rename from opt/inverter/wunderground.php rename to wunderground.php