Merge branch 'master' of https://git.cpi.imtek.uni-freiburg.de/holgi/honeypot

production.ini

@@ -1,69 +0,0 @@
-###
-# app configuration
-# https://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html
-###
-
-[app:main]
-use = egg:honeypot
-
-pyramid.reload_templates = false
-pyramid.debug_authorization = false
-pyramid.debug_notfound = false
-pyramid.debug_routematch = false
-pyramid.default_locale_name = en
-pyramid.includes =
-    pyramid_mailer
-
-moin.config_path = /var/www/moin/config/
-
-# email delivery
-mail.host = mail.uni-freiburg.de
-mail.port = 25
-mail.username = 
-mail.password = 
-mail.tls = True
-#mail.ssl = True
-mail.default_sender = cpiserver@imtek.uni-freiburg.de
-mail.admin_email = 
-    frey@imtek.de
-    prucker@imtek.de
-
-###
-# wsgi server configuration
-###
-
-[server:main]
-use = egg:waitress#main
-listen = *:6543
-
-###
-# logging configuration
-# https://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html
-###
-
-[loggers]
-keys = root, honeypot
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-[logger_root]
-level = WARN
-handlers = console
-
-[logger_honeypot]
-level = WARN
-handlers =
-qualname = honeypot
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = NOTSET
-formatter = generic
-
-[formatter_generic]
-format = %(asctime)s %(levelname)-5.5s [%(name)s:%(lineno)s][%(threadName)s] %(message)s