merging
authorSandro Knauß <knauss@netzguerilla.net>
Wed, 21 Dec 2011 22:07:48 +0100
changeset 90 eb04ac3a8327
parent 89 48da990ddf8d (current diff)
parent 83 cb50c2c53d11 (diff)
child 91 191c2c1d6e53
child 302 3f4bdea2abbf
merging
iro/iro.conf.inst
--- a/.hgignore	Wed Dec 21 22:07:28 2011 +0100
+++ b/.hgignore	Wed Dec 21 22:07:48 2011 +0100
@@ -9,3 +9,6 @@
 MyIro_daemon
 */.svn/*
 .svn/*
+iro.egg-info/*
+dist/*
+build/*
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MyIro.inst	Wed Dec 21 22:07:48 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)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/iro.conf.inst	Wed Dec 21 22:07:48 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=
--- a/iro/iro.conf.inst	Wed Dec 21 22:07:28 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=