Merge "Make SSL certificate for TOR-Agent valid for 10 year period."

Juniper · Jul 16, 2015 · 2eb1caa · 2eb1caa
2 parents 1112310 + d144f9f
commit 2eb1caa
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/fabfile/tasks/provision.py b/fabfile/tasks/provision.py
@@ -1862,8 +1862,9 @@ def add_tor_agent_by_index(index, node_info, restart=True):
                     ssl_files_copied_from_standby = True
             # Generate files if we didn't copy from standby
             if not ssl_files_copied_from_standby:
-                ssl_cmd = "openssl req -new -x509 -sha256 -newkey rsa:4096 -nodes -subj \"/C=US/ST=Global/L="
-                ssl_cmd += tor_name + "/O=" + tor_vendor_name + "/CN=" + domain_name + "\""
+                ssl_cmd = "openssl req -new -x509 -days 3650 -text -sha256"
+                ssl_cmd += " -newkey rsa:4096 -nodes -subj \"/C=US/ST=Global/O="
+                ssl_cmd += + tor_vendor_name + "/CN=" + domain_name + "\""
                 ssl_cmd += " -keyout " + privkey_file + " -out " + cert_file
                 sudo(ssl_cmd)