X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2Fnetwork%2Fservices%2Fuhttpd%2Ffiles%2Fuhttpd.config;h=40ce67fd010f75c100a1573137fcd2faea241f4c;hp=a3deb9cf04356fbd84396fb583b81158714db266;hb=0cf3c5dd7257dff1c87b61c5e53e5b1787ab7015;hpb=f00a4ae6e0b1f7b3d84e11e8dc4dd562088584e0

diff --git a/package/network/services/uhttpd/files/uhttpd.config b/package/network/services/uhttpd/files/uhttpd.config
index a3deb9cf04..40ce67fd01 100644
--- a/package/network/services/uhttpd/files/uhttpd.config
+++ b/package/network/services/uhttpd/files/uhttpd.config
@@ -10,7 +10,7 @@ config uhttpd main
 	list listen_https	[::]:443
 
 	# Redirect HTTP requests to HTTPS if possible
-	option redirect_https	1
+	option redirect_https	0
 
 	# Server document root
 	option home		/www
@@ -59,7 +59,7 @@ config uhttpd main
 
 	# Specify the ubus-rpc prefix and socket path.
 #	option ubus_prefix	/ubus
-#	option ubus_socket	/var/run/ubus.sock
+#	option ubus_socket	/var/run/ubus/ubus.sock
 
 	# CGI/Lua timeout, if the called script does not
 	# write data within the given amount of seconds,
@@ -118,9 +118,17 @@ config cert defaults
 	# Validity time
 	option days		730
 
+	# key type: rsa or ec
+	option key_type		ec
+
 	# RSA key size
 	option bits		2048
 
+	# EC curve name
+	# Curve names vary between px5g-{wolfssl,mbedtls} and openssl
+	# P-256 or P-384 are guaranteed to work
+	option ec_curve		P-256
+
 	# Location
 	option country		ZZ
 	option state		Somewhere