8deb949551
Switch to rpcd based uci apply/rollback workflow which helps to avoid soft- bricking devices by requiring an explicit confirmation call after config apply. When a user now clicks "Save & Apply", LuCI first issues a call to uci apply which commits and reloads configuration, then goes into a polling countdown mode where it repeatedly attempts to call uci confirm. If the committed configuration is sane, the confirm call will go through and cancel rpcd's pending rollback timer. If the configuration change leads to a loss of connectivity (e.g. due to bad firewall rules or similar), the rollback mechanism will kick in after the timeout and revert configuration files and pending changes to the pre-apply state. In order to cover such rare cases where a lost of connectivity is expected and desired, the user is offered an "unchecked" apply option after timing out, which allows committing and applying the changes anyway, without the extra safety checks. As a consequence of this change, the luci-reload mechanism is now completely unsused since rpcd uses ubus config reload signals to reload affected services, which means that only procd-enabled services will receive proper reload treatment with the new workflow. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
47 lines
1.4 KiB
HTML
47 lines
1.4 KiB
HTML
<%#
|
|
Copyright 2008 Steven Barth <steven@midlink.org>
|
|
Copyright 2008-2018 Jo-Philipp Wich <jo@mein.io>
|
|
Licensed to the public under the Apache License 2.0.
|
|
-%>
|
|
|
|
<%+header%>
|
|
|
|
<%-
|
|
local node, redir_url = luci.dispatcher.lookup(luci.http.formvalue("redir"))
|
|
|
|
include("cbi/apply_widget")
|
|
include("admin_uci/changelog")
|
|
|
|
cbi_apply_widget(redir_url or url("admin/uci/changes"))
|
|
-%>
|
|
|
|
<h2 name="content"><%:Configuration%> / <%:Changes%></h2>
|
|
|
|
<% if changes then %>
|
|
<%- uci_changelog(changes) -%>
|
|
<% else %>
|
|
<p><strong><%:There are no pending changes!%></strong></p>
|
|
<% end %>
|
|
|
|
<div class="alert-message" id="cbi_apply_status" style="display:none"></div>
|
|
|
|
<div class="cbi-page-actions">
|
|
<% if redir_url then %>
|
|
<div style="float:left">
|
|
<form class="inline" method="get" action="<%=luci.util.pcdata(redir_url)%>">
|
|
<input class="cbi-button cbi-button-link" style="float:left; margin:0" type="submit" value="<%:Back%>" />
|
|
</form>
|
|
</div>
|
|
<% end %>
|
|
|
|
<div style="text-align:right">
|
|
<input class="cbi-button cbi-button-save" type="button" id="apply_button" value="<%:Save & Apply%>" onclick="uci_apply(true); this.blur()" />
|
|
<form class="inline" method="post" action="<%=controller%>/admin/uci/revert">
|
|
<input type="hidden" name="token" value="<%=token%>" />
|
|
<input type="hidden" name="redir" value="<%=pcdata(luci.http.formvalue("redir"))%>" />
|
|
<input class="cbi-button cbi-button-reset" type="submit" value="<%:Revert%>" />
|
|
</form>
|
|
</div>
|
|
</div>
|
|
|
|
<%+footer%>
|