summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Rosdahl <joel@rosdahl.net>2015-08-04 10:45:40 +0200
committerJoel Rosdahl <joel@rosdahl.net>2015-08-04 10:45:40 +0200
commit9452a026ee871b61620820dd153d96ced3462070 (patch)
tree4e5aaea29dbe4c779d0061bba396664afded9c61
parented76e15e99d825caac9f80cb3128cb39cbb7e1e8 (diff)
downloadminiircd-9452a026ee871b61620820dd153d96ced3462070.tar.gz
miniircd-9452a026ee871b61620820dd153d96ced3462070.zip
Find certificate specified with relative path when using --daemon
-rw-r--r--CHANGES4
-rwxr-xr-xminiircd5
2 files changed, 9 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 66a9322..dd2d986 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+Unreleased
+
+ * Find certificate specified with relative path when using --daemon.
+
1.1 (2015-05-22)
* Allow dash in nicknames.
diff --git a/miniircd b/miniircd
index 6d81189..34847e8 100755
--- a/miniircd
+++ b/miniircd
@@ -643,6 +643,11 @@ class Server(object):
self.setuid = options.setuid
self.statedir = options.statedir
+ # Find certificate after daemonization if path is relative:
+ if self.ssl_pem_file and os.path.exists(self.ssl_pem_file):
+ self.ssl_pem_file = os.path.abspath(self.ssl_pem_file)
+ # else: might exist in the chroot jail, so just continue
+
if options.listen:
self.address = socket.gethostbyname(options.listen)
else: