12c12
<     templates="countryname statename localityname organisationname ouname hostname email"
---
>     templates="organisationname hostname email"
24,35d23
<      db_get make-ssl-cert/countryname
<      CountryName="$RET"
<      db_fset make-ssl-cert/countryname seen false
< 
<      db_get make-ssl-cert/statename
<      StateName="$RET"
<      db_fset make-ssl-cert/statename seen false
< 
<      db_get make-ssl-cert/localityname
<      LocalityName="$RET"
<      db_fset make-ssl-cert/localityname seen false
< 
40,43d27
<      db_get make-ssl-cert/ouname
<      OUName="$RET"
<      db_fset make-ssl-cert/ouname seen false
< 
54,56d37
<      CountryName="XX"
<      StateName="There is no such thing outside US"
<      LocalityName="Everywhere"
58d38
<      OUName="Office for Complication of Otherwise Simple Affairs"
64,68c44
<     sed -e s#@CountryName@#"$CountryName"# \
< 	-e s#@StateName@#"$StateName"# \
< 	-e s#@LocalityName@#"$LocalityName"# \
< 	-e s#@OrganisationName@#"$OrganisationName"# \
< 	-e s#@OUName@#"$OUName"# \
---
>     sed -e s#@OrganisationName@#"$OrganisationName"# \
118c94
<     openssl req -config $TMPFILE -new -x509 -nodes -out $output -keyout $output > /dev/null 2>&1
---
>     openssl req -config $TMPFILE -new -x509 -nodes -out $output -keyout $output -days 1095 > /dev/null 2>&1