removed last crap, config cleanup of unused values packaging V0.8.1

Tue, 25 Nov 2014 18:27:31 +0100

author
Malte Bayer <mbayer@neo-soft.org>
date
Tue, 25 Nov 2014 18:27:31 +0100
branch
packaging
changeset 50
cb7e0260c473
parent 49
b2abf1243555
child 51
288876e4e9dc

removed last crap, config cleanup of unused values

.hgignore file | annotate | diff | comparison | revisions
README file | annotate | diff | comparison | revisions
install/var/log/victrond.trace file | annotate | diff | comparison | revisions
scripts/run.sh file | annotate | diff | comparison | revisions
victrond/config.py file | annotate | diff | comparison | revisions
victrond/victrond.py file | annotate | diff | comparison | revisions
--- a/.hgignore	Tue Nov 25 18:17:29 2014 +0100
+++ b/.hgignore	Tue Nov 25 18:27:31 2014 +0100
@@ -4,4 +4,3 @@
 *.rrd*
 localconfig.py
 http/img/*.png
-screenlog.*
\ No newline at end of file
--- a/README	Tue Nov 25 18:17:29 2014 +0100
+++ b/README	Tue Nov 25 18:27:31 2014 +0100
@@ -1,20 +1,18 @@
 Licensed under GPL V3
 
-Its almost stable version - use it at your own risk in productive environments
+stable version - use it at your own risk in productive environments
 
 some basic victron info:
     http://svn.debian.org/wsvn/nut/trunk/drivers/victron.c
     otherwise see my own hacks in ./sources/hacks
 
 RUN:
-    use the provided "run.sh" script to start the 
-    OR
-    run daemon with /etc/init.d/victrond
+    automatically via supervisor
 
 requires:
-    (screen) (optional)
+    supervisor
     rrdtool
-    python2.5
-    python2.5-rrdtool
+    python
+    python-rrdtool
     python-serial
-    
+
--- a/scripts/run.sh	Tue Nov 25 18:17:29 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-screen -LdmS ups ./victrond.py
\ No newline at end of file
--- a/victrond/config.py	Tue Nov 25 18:17:29 2014 +0100
+++ b/victrond/config.py	Tue Nov 25 18:27:31 2014 +0100
@@ -1,5 +1,4 @@
 # MAIN SETTINGS
-DAEMONIZE = False  # set this to true when you want to run it as daemon
 SMTP_HOST = "localhost"
 SENDER_EMAIL = "root@host.somedomain"  # The sender address
 NOTICE_EMAIL = "neosoft@deimos"  # send any notices to this address (ups events)
@@ -10,7 +9,7 @@
 SHUTDOWN_POSTDELAY = 300  # After issuing shutdown command set UPS to auto-shutdown after POSTDELAY (minimum 60) seconds
 # (give enough time for system to do a proper shutdown)
 SHUTDOWN_BATTERYLEFT = 5  # override shutdown_delay when estimated runtime lower than x minutes
-SHUTDOWN_CMD = "/usr/lib/victrond/shutdown.sh now"  # which command should be executed after shutdown delay?
+SHUTDOWN_CMD = "/usr/lib/victrond/scripts/shutdown.sh now"  # which command should be executed after shutdown delay?
 
 # HTTP SERVER CONFIGURATION
 HTTP_ENABLED = True
@@ -34,10 +33,6 @@
 LOG_DEBUG = False  # enable all debugging output
 LOG_INFOS = True  # log general infos
 
-# DAEMON SETTINGS
-PIDFILE = "/var/run/victrond.pid"  # not in use, pidfile handling is done by init script
-TRACEFILE = "/var/log/victrond.trace"
-
 # Import the local config if exists and  override the above default settings
 try:
     from localconfig import *
--- a/victrond/victrond.py	Tue Nov 25 18:17:29 2014 +0100
+++ b/victrond/victrond.py	Tue Nov 25 18:27:31 2014 +0100
@@ -1,7 +1,8 @@
 #!/usr/bin/env python
 """
 Victron UPS Daemon with Webinterface
-2010-2011 by NeoSoft - Malte Bayer
+2010-2014 by NeoSoft - Malte Bayer
+Contributions: Tobias Paepke
 """
 import os
 

mercurial