From 7626497d9d7d55ab7eb8728286fc0481e86c1ced Mon Sep 17 00:00:00 2001 From: Kload Date: Wed, 10 Jul 2013 22:17:31 +0200 Subject: [PATCH] Correct CA generation for multiple yunohost instances --- yunohost_tools.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/yunohost_tools.py b/yunohost_tools.py index c921c761..92c7db7c 100644 --- a/yunohost_tools.py +++ b/yunohost_tools.py @@ -265,7 +265,9 @@ def tools_postinstall(domain, password, dyndns=False): 'echo "01" > '+ ssl_dir +'/serial', 'rm '+ ssl_dir +'/index.txt', 'touch '+ ssl_dir +'/index.txt', - 'openssl req -x509 -new -config '+ ssl_dir +'/openssl.cnf -days 3650 -out '+ ssl_dir +'/ca/cacert.pem -keyout '+ ssl_dir +'/ca/cakey.pem -nodes -batch', + 'cp '+ ssl_dir +'/openssl.cnf '+ ssl_dir +'/openssl.ca.cnf ', + 'sed -i "s/yunohost.org/'+ domain +'/g" '+ ssl_dir +'/openssl.ca.cnf ', + 'openssl req -x509 -new -config '+ ssl_dir +'/openssl.ca.cnf -days 3650 -out '+ ssl_dir +'/ca/cacert.pem -keyout '+ ssl_dir +'/ca/cakey.pem -nodes -batch', 'cp '+ ssl_dir +'/ca/cacert.pem /etc/ssl/certs/ca-yunohost_crt.pem', 'update-ca-certificates' ]