From: Zoltan HERPAI <wigyori@uid0.hu>
Date: Tue, 7 Nov 2017 08:45:56 +0000 (+0100)
Subject: merge: uhttpd: update cert generation to match system defaults
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2ffff58c2b8c69a8c6af60702ef962ad497c53ad;p=openwrt%2Fstaging%2Fstintel.git

merge: uhttpd: update cert generation to match system defaults

Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
---

diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init
index 6b8be1c7e4..47270bcc15 100755
--- a/package/network/services/uhttpd/files/uhttpd.init
+++ b/package/network/services/uhttpd/files/uhttpd.init
@@ -52,7 +52,7 @@ generate_keys() {
 	[ -n "$GENKEY_CMD" ] && {
 		$GENKEY_CMD \
 			-days ${days:-730} -newkey rsa:${bits:-2048} -keyout "${UHTTPD_KEY}.new" -out "${UHTTPD_CERT}.new" \
-			-subj /C="${country:-DE}"/ST="${state:-Saxony}"/L="${location:-Leipzig}"/O="${commonname:-Lede}$UNIQUEID"/CN="${commonname:-Lede}"
+			-subj /C="${country:-ZZ}"/ST="${state:-Somewhere}"/L="${location:-Unknown}"/O="${commonname:-OpenWrt}$UNIQUEID"/CN="${commonname:-OpenWrt}"
 		sync
 		mv "${UHTTPD_KEY}.new" "${UHTTPD_KEY}"
 		mv "${UHTTPD_CERT}.new" "${UHTTPD_CERT}"