netbird/plugins
0
0
Fork 0
mirror of https://github.com/netbirdio/plugins.git synced 2026-05-22 18:44:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

move RNDC key to general page (#3258)

Browse Source
This commit is contained in:
Robbert Rijkse
2023-01-11 14:34:21 +01:00
committed by GitHub
parent 97e46ed32c
commit 7b2119578f
4 changed files with 19 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/GeneralController.php
-1
View File
@@ -34,7 +34,6 @@ class GeneralController extends \OPNsense\Base\IndexController
{
$this->view->generalForm = $this->getForm("general");
$this->view->dnsblForm = $this->getForm("dnsbl");
$this->view->rndcKeyForm = $this->getForm("rndcKey");
$this->view->formDialogEditBindAcl = $this->getForm("dialogEditBindAcl");
$this->view->formDialogEditBindPrimaryDomain = $this->getForm("dialogEditBindPrimaryDomain");
$this->view->formDialogEditBindSecondaryDomain = $this->getForm("dialogEditBindSecondaryDomain");
dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/general.xml
+19
View File
@@ -169,4 +169,23 @@
<advanced>true</advanced>
<help>Except a list of IPs from rate-limiting like ::1</help>
</field>
<field>
<type>header</type>
<label>RNDC Key</label>
<advanced>true</advanced>
</field>
<field>
<id>general.rndcalgo</id>
<label>Algorithm</label>
<type>dropdown</type>
<advanced>true</advanced>
<help>Set the authentication algorithm for the RNDC key. This requires a restart of the Bind Service.</help>
</field>
<field>
<id>general.rndcsecret</id>
<label>Secret</label>
<type>text</type>
<advanced>true</advanced>
<help>The base64-encoded RNDC key. This requires a restart of the Bind Service.</help>
</field>
</form>
dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/rndcKey.xml
-14
View File
@@ -1,14 +0,0 @@
<form>
<field>
<id>general.rndcalgo</id>
<label>Algorithm</label>
<type>dropdown</type>
<help>Set the authentication algorithm for the RNDC key.</help>
</field>
<field>
<id>general.rndcsecret</id>
<label>Secret</label>
<type>text</type>
<help>The base64-encoded RNDC key.</help>
</field>
</form>
dns/bind/src/opnsense/mvc/app/views/OPNsense/Bind/general.volt
-25
View File
@@ -32,7 +32,6 @@ POSSIBILITY OF SUCH DAMAGE.
<li class="active"><a data-toggle="tab" href="#general">{{ lang._('General') }}</a></li>
<li><a data-toggle="tab" href="#dnsbl">{{ lang._('DNSBL') }}</a></li>
<li><a data-toggle="tab" href="#acls">{{ lang._('ACLs') }}</a></li>
<li><a data-toggle="tab" href="#keys">{{ lang._('Keys') }}</a></li>
<li><a data-toggle="tab" href="#primary-domains">{{ lang._('Primary Zones') }}</a></li>
<li><a data-toggle="tab" href="#secondary-domains">{{ lang._('Secondary Zones') }}</a></li>
</ul>
@@ -85,21 +84,6 @@ POSSIBILITY OF SUCH DAMAGE.
<br /><br />
</div>
</div>
<div id="keys" class="tab-pane fade in">
<div class="content-box">
<div class="col-md-12">
<h2>{{ lang._('RNDC Key') }}</h2>
</div>
{{ partial("layout_partials/base_form",['fields':rndcKeyForm,'id':'frm_general_settings'])}}
</div>
<div class="col-md-12">
<hr />
<button class="btn btn-primary" id="saveRestartAct_rndckey" type="button"><b>{{ lang._('Save & Restart') }}</b> <i id="saveRestartAct_rndckey_progress"></i></button>
<br />
<b>Note:</b> Bind will be restarted when you Save, this is required when the RNDC key changes.
<br /><br />
</div>
</div>
<div id="primary-domains" class="tab-pane fade in">
<div class="col-md-12">
<h2>{{ lang._('Zones') }}</h2>
@@ -339,15 +323,6 @@ $( document ).ready(function() {
});
});
$("#saveRestartAct_rndckey").click(function(){
saveFormToEndpoint(url="/api/bind/general/set", formid='frm_general_settings',callback_ok=function(){
$("#saveRestartAct_rndckey_progress").addClass("fa fa-spinner fa-pulse");
ajaxCall("/api/bind/service/restart", {}, function(data,status) {
updateServiceControlUI('bind');
$("#saveRestartAct_rndckey_progress").removeClass("fa fa-spinner fa-pulse");
});
});
});
$(".saveAct_domain").click(function(){
$(".saveAct_domain_progress").addClass("fa fa-spinner fa-pulse");
ajaxCall("/api/bind/service/reconfigure", {}, function(data,status) {