From 6835427305827c2ec775c284807492d7ba083c2b Mon Sep 17 00:00:00 2001
From: JPHammonds <JPHammonds@anl.gov>
Date: Tue, 13 Aug 2019 09:43:30 -0500
Subject: [PATCH] Use Environment variables set in dm.deploy.conf or
 dm_dev.deploy.conf to set the org and unit names

---
 etc/dm.openssl.conf.template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/etc/dm.openssl.conf.template b/etc/dm.openssl.conf.template
index d745ec3a..cae7ab08 100644
--- a/etc/dm.openssl.conf.template
+++ b/etc/dm.openssl.conf.template
@@ -144,14 +144,17 @@ countryName_max			= 2
 #localityName_default		= 
 
 0.organizationName		= Organization Name (eg, company)
-0.organizationName_default	= Argonne National Laboratory
+#0.organizationName_default = Argonne National Laboratory
+0.organizationName_default  = CA_ORG_NAME_0
 
 # we can do this but it is not needed normally :-)
 1.organizationName		= Second Organization Name (eg, company)
-1.organizationName_default	= Advanced Photon Source
+#1.organizationName_default  = Advanced Photon Source
+1.organizationName_default  = CA_ORG_NAME_1
 
 organizationalUnitName		= Organizational Unit Name (eg, section)
-organizationalUnitName_default	= AES/SSG
+#organizationalUnitName_default  = AES/SSG
+organizationalUnitName_default  = CA_UNIT_NAME
 
 commonName          = Common Name (eg, your name or your server\'s hostname)
 commonName_max          = 64
-- 
GitLab