# HG changeset patch # User Sandro Knauß # Date 1324500707 -3600 # Node ID acd4c2006602b2d100c419dbba2fcaec82731256 # Parent edf7e94cd6079754786e56a15fa93c5b9f7a7f93# Parent cb50c2c53d11eb4967cc88546fd65ae593276517 merging Verschiebe inst Dateien diff -r edf7e94cd607 -r acd4c2006602 .hgignore --- a/.hgignore Wed Dec 21 21:50:50 2011 +0100 +++ b/.hgignore Wed Dec 21 21:51:47 2011 +0100 @@ -9,3 +9,6 @@ MyIro_daemon */.svn/* .svn/* +iro.egg-info/* +dist/* +build/* diff -r edf7e94cd607 -r acd4c2006602 MyIro.inst --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/MyIro.inst Wed Dec 21 21:51:47 2011 +0100 @@ -0,0 +1,15 @@ +#!/usr/bin/python +from iro import start,User,Admin +import logging +from logging.handlers import WatchedFileHandler +format='%(asctime)s %(name)s(%(processName)s)-%(levelname)s: %(message)s' +fileHandler=WatchedFileHandler("/var/log/MyIro.log") +fileHandler.setFormatter(logging.Formatter(format)) +fileHandler.setLevel(logging.INFO) +logging.getLogger().setLevel(logging.INFO) +logging.getLogger().addHandler(fileHandler) + +userlist=[{"name":"blablub","password":"foo", "class":User}, + {"name":"admin","password":"admin", "class": Admin}, + ] +start(userlist) diff -r edf7e94cd607 -r acd4c2006602 iro.conf.inst --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/iro.conf.inst Wed Dec 21 21:51:47 2011 +0100 @@ -0,0 +1,37 @@ +[geonet] +host = localhost +port = 25 +send_from = +user = +password = + + +[FAX_de] +host = localhost +port = 25 +send_from = +user = +password = + +[sipgate] +user = +password = + +[smtp] +host = localhost +port = 25 +send_from = +user = +password = +TLS=No +SSL=No + +[server] +key= +cert= + +[smstrade] +key= +route=basic +debug=1 +from= diff -r edf7e94cd607 -r acd4c2006602 iro/iro.conf.inst --- a/iro/iro.conf.inst Wed Dec 21 21:50:50 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -[geonet] -host = localhost -port = 25 -send_from = -user = -password = - - -[FAX_de] -host = localhost -port = 25 -send_from = -user = -password = - -[sipgate] -user = -password = - -[smtp] -host = localhost -port = 25 -send_from = -user = -password = -TLS=No -SSL=No - -[server] -key= -cert= - -[smstrade] -key= -route=basic -debug=1 -from=