Commit 907d6905 authored by Leigh Stoller's avatar Leigh Stoller

Parameterize the sslcert strings (country, state, orgname, locale).

parent f1a659b8
......@@ -2961,6 +2961,38 @@ sub CreateDefsFile($)
}
last SWITCH;
};
/^SSLCERT_COUNTRY$/ && do {
my $value = "US";
if (exists($emulabconfig{"SSLCERT_COUNTRY"})) {
my $value = $emulabconfig{"SSLCERT_COUNTRY"};
}
print OUTDEFS "SSLCERT_COUNTRY=${value}\n";
last SWITCH;
};
/^SSLCERT_STATE$/ && do {
my $value = "Utah";
if (exists($emulabconfig{"SSLCERT_STATE"})) {
my $value = $emulabconfig{"SSLCERT_STATE"};
}
print OUTDEFS "SSLCERT_STATE=${value}\n";
last SWITCH;
};
/^SSLCERT_LOCALITY=$/ && do {
my $value = "Salt Lake Sim City";
if (exists($emulabconfig{"SSLCERT_LOCALITY"})) {
my $value = $emulabconfig{"SSLCERT_LOCALITY"};
}
print OUTDEFS "SSLCERT_LOCALITY=${value}\n";
last SWITCH;
};
/^SSLCERT_ORGNAME$/ && do {
my $value = "Utah Network Second Life";
if (exists($emulabconfig{"SSLCERT_ORGNAME"})) {
my $value = $emulabconfig{"SSLCERT_ORGNAME"};
}
print OUTDEFS "SSLCERT_ORGNAME=${value}\n";
last SWITCH;
};
print OUTDEFS $line;
}
......
......@@ -64,10 +64,10 @@ TBUSEDBI=1
# Note that OrganizationalUnit is set in the cnf file.
# CommonName is typically set to BOSSNODE and emailAddress to TBOPSEMAIL
#
SSLCERT_COUNTRY="US"
SSLCERT_STATE="Utah"
SSLCERT_LOCALITY="Salt Lake City Virtual World"
SSLCERT_ORGNAME="Utah Network ElabInElab"
SSLCERT_COUNTRY=changeme
SSLCERT_STATE=changeme
SSLCERT_LOCALITY=changeme
SSLCERT_ORGNAME=changeme
#
# Network config stuff. Used to generate initial named and dhcpd config files.
#
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment