diff options
3 files changed, 50 insertions, 0 deletions
diff --git a/modules/luci-mod-system/htdocs/luci-static/resources/view/system/uhttpd.js b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/uhttpd.js new file mode 100644 index 0000000000..d02e18505a --- /dev/null +++ b/modules/luci-mod-system/htdocs/luci-static/resources/view/system/uhttpd.js @@ -0,0 +1,22 @@ +'use strict'; +'require view'; +'require form'; + +return view.extend({ + render: function() { + var m, s, o; + + m = new form.Map('uhttpd', _('HTTP(S) Access'), _('uHTTPd offers <abbr title="Hypertext Transfer Protocol">HTTP</abbr> or <abbr title="Hypertext Transfer Protocol Secure">HTTPS</abbr> network access.')); + + s = m.section(form.NamedSection, 'main', 'uhttpd', _('Settings')); + s.addremove = false; + + o = s.option(form.Flag, 'redirect_https', _('Redirect to HTTPS'), _('Enable automatic redirection of <abbr title="Hypertext Transfer Protocol">HTTP</abbr> requests to <abbr title="Hypertext Transfer Protocol Secure">HTTPS</abbr> port.')); + o.enabled = 'on'; + o.disabled = 'off'; + o.default = o.disabled; + o.rmempty = false; + + return m.render(); + } +}); diff --git a/modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json b/modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json index 4022e0cebf..ebae989d0e 100644 --- a/modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json +++ b/modules/luci-mod-system/root/usr/share/luci/menu.d/luci-mod-system.json @@ -60,6 +60,20 @@ } }, + "admin/system/admin/uhttpd": { + "title": "HTTP(S) Access", + "order": 4, + "action": { + "type": "view", + "path": "system/uhttpd" + }, + "depends": { + "acl": [ "luci-mod-system-uhttpd" ], + "fs": { "/usr/sbin/uhttpd": "executable" } + } + }, + + "admin/system/startup": { "title": "Startup", "order": 45, diff --git a/modules/luci-mod-system/root/usr/share/rpcd/acl.d/luci-mod-system.json b/modules/luci-mod-system/root/usr/share/rpcd/acl.d/luci-mod-system.json index e04bcdb476..9acb6e4471 100644 --- a/modules/luci-mod-system/root/usr/share/rpcd/acl.d/luci-mod-system.json +++ b/modules/luci-mod-system/root/usr/share/rpcd/acl.d/luci-mod-system.json @@ -38,6 +38,20 @@ } }, + "luci-mod-system-uhttpd": { + "description": "Grant access to uHTTPd configuration", + "read": { + "uci": [ "uhttpd" ] + }, + "write": { + "ubus": { + "luci": [ "setInitAction" ] + }, + "uci": [ "uhttpd" ] + } + }, + + "luci-mod-system-init": { "description": "Grant access to startup configuration", "read": { |