merge: packages: update branding in core packages

[openwrt/openwrt.git] / package / network / services / uhttpd / files / uhttpd.config

diff --git a/package/network/services/uhttpd/files/uhttpd.config b/package/network/services/uhttpd/files/uhttpd.config
index 683e032fb47e88fa6af1f62aecaeeb103db56490..a7d769e18878b5200ce0bbee661f1f15ffbefb02 100644 (file)
--- a/package/network/services/uhttpd/files/uhttpd.config
+++ b/package/network/services/uhttpd/files/uhttpd.config
@@ -3,11 +3,14 @@ config uhttpd main
 
        # HTTP listen addresses, multiple allowed
        list listen_http        0.0.0.0:80
-#      list listen_http        [::]:80
+       list listen_http        [::]:80
 
        # HTTPS listen addresses, multiple allowed
        list listen_https       0.0.0.0:443
-#      list listen_https       [::]:443
+       list listen_https       [::]:443
+
+       # Redirect HTTP requests to HTTPS if possible
+       option redirect_https   1
 
        # Server document root
        option home             /www
@@ -48,8 +51,8 @@ config uhttpd main
 
        # Lua url prefix and handler script.
        # Lua support is disabled if no prefix given.
-#      option lua_prefix       /luci
-#      option lua_handler      /usr/lib/lua/luci/sgi/uhttpd.lua
+       option lua_prefix       /luci
+       option lua_handler      /usr/lib/lua/luci/sgi/uhttpd.lua
 
        # Specify the ubus-rpc prefix and socket path.
 #      option ubus_prefix      /ubus
@@ -100,20 +103,30 @@ config uhttpd main
        # except for development and debug purposes!
 #      option no_ubusauth      0
 
+       # For this instance of uhttpd use the listed httpauth
+       # sections to require Basic auth to the specified
+       # resources.
+#      list httpauth prefix_user
+
 
-# Certificate defaults for px5g key generator
-config cert px5g
+# Defaults for automatic certificate and key generation
+config cert defaults
 
        # Validity time
        option days             730
 
        # RSA key size
-       option bits             1024
+       option bits             2048
 
        # Location
-       option country          DE
-       option state            Berlin
-       option location         Berlin
+       option country          ZZ
+       option state            Somewhere
+       option location         Unknown
 
        # Common name
-       option commonname       OpenWrt
+       option commonname       '%D'
+
+# config httpauth prefix_user
+#      option prefix /protected/url/path
+#      option username user
+#      option password 'plaintext_or_md5_or_$p$user_for_system_user'