Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Wed, 23 Dec 2015 12:11:07 +0100
changeset 7034 89221daefae9
parent 7031 7d0ce5e6a6d3 (current diff)
parent 7033 b5bc9f77f096 (diff)
child 7035 817c7b197ac7
Merge 0.9->0.10
certs/Makefile
plugins/mod_admin_telnet.lua
--- a/certs/Makefile	Wed Dec 23 12:10:26 2015 +0100
+++ b/certs/Makefile	Wed Dec 23 12:11:07 2015 +0100
@@ -59,5 +59,5 @@
 	sed 's,example\.com,$*,g' openssl.cnf > $@
 
 %.key:
-	openssl genrsa $(keysize) > $@
-	@chmod 400 $@
+	umask 0077 && openssl genrsa -out $@ $(keysize)
+	@chmod 400 $@ -c