Merge remote-tracking branch 'origin/master'

This commit is contained in:
Joris Vink 2013-09-10 14:05:31 +02:00
commit ef463b49eb
1 changed files with 3 additions and 5 deletions

View File

@ -1,9 +1,8 @@
# Example Kore configuration
# Server configuration.
#bind 127.0.0.1 443
#bind ::1 443
bind 10.11.1.174 443
bind 127.0.0.1 443
bind ::1 443
# The path worker processes will chroot too after starting.
chroot /home/joris/src/kore
@ -69,8 +68,7 @@ load modules/example/example.module
# handler path module_callback
# Example domain that responds to localhost.
#domain localhost {
domain 10.11.1.174 {
domain localhost {
certfile cert/server.crt
certkey cert/server.key
accesslog /var/log/kore_access.log