Compare commits
3 Commits
1_0-25_el8
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| a2c3f3cdb4 | |||
| 367e4da9e8 | |||
| 5858500b80 |
@@ -18,7 +18,7 @@ use Mojo::Base 'Mojolicious::Controller';
|
||||
use Locale::gettext;
|
||||
use SrvMngr::I18N;
|
||||
use SrvMngr qw( theme_list init_session is_normal_password );
|
||||
use esmith::ConfigDB;
|
||||
use esmith::ConfigDB::UTF8;
|
||||
use Net::IP;
|
||||
my $adb;
|
||||
my $cdb;
|
||||
@@ -29,10 +29,10 @@ sub main {
|
||||
my $c = shift;
|
||||
$c->app->log->info($c->log_req);
|
||||
my %wrg_datas = ();
|
||||
$wdb = esmith::ConfigDB->open('wireguard') || esmith::ConfigDB->create('wireguard');
|
||||
$wdb = esmith::ConfigDB::UTF8->open('wireguard') || esmith::ConfigDB::UTF8->create('wireguard');
|
||||
my $title = $c->l('wrg_FORM_TITLE');
|
||||
$wrg_datas{'trt'} = 'LST';
|
||||
$cdb = esmith::ConfigDB->open() || die "Couldn't open config DB\n";
|
||||
$cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config DB\n";
|
||||
my $wg = $cdb->get('wg-quick@wg0');
|
||||
$wrg_datas{'wgpub'} = $wg->prop('public');
|
||||
$wrg_datas{'wgip'} = $wg->prop('ip');
|
||||
@@ -61,8 +61,8 @@ sub do_display {
|
||||
my $title = $c->l('wrg_FORM_TITLE');
|
||||
my $modul = '';
|
||||
$adb = esmith::AccountsDB->open() || die "Couldn't open accounts DB\ndb";
|
||||
$cdb = esmith::ConfigDB->open() || die "Couldn't open config DB\n";
|
||||
$wdb = esmith::ConfigDB->open('wireguard') || esmith::ConfigDB->create('wireguard');
|
||||
$cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config DB\n";
|
||||
$wdb = esmith::ConfigDB::UTF8->open('wireguard') || esmith::ConfigDB::UTF8->create('wireguard');
|
||||
|
||||
#$ndb = esmith::NetworksDB->open_ro || die "Error opening networks DB\n";
|
||||
$wrg_datas{'trt'} = $trt;
|
||||
@@ -125,8 +125,8 @@ sub do_action {
|
||||
my $result = '';
|
||||
my $res = '';
|
||||
$adb = esmith::AccountsDB->open() || die "Couldn't open accounts DB\ndb";
|
||||
$cdb = esmith::ConfigDB->open() || die "Couldn't open config DB\n";
|
||||
$wdb = esmith::ConfigDB->open('wireguard') || esmith::ConfigDB->create('wireguard');
|
||||
$cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config DB\n";
|
||||
$wdb = esmith::ConfigDB::UTF8->open('wireguard') || esmith::ConfigDB::UTF8->create('wireguard');
|
||||
$ndb = esmith::NetworksDB->open_ro || die "Error opening networks DB\n";
|
||||
|
||||
if ($trt eq 'QRC') {
|
||||
@@ -216,7 +216,7 @@ sub do_action {
|
||||
}
|
||||
|
||||
#force reload as successfull (for Main)
|
||||
$wdb = esmith::ConfigDB->open('wireguard');
|
||||
$wdb = esmith::ConfigDB::UTF8->open('wireguard');
|
||||
my $message = "'Wireguard' update ($trt) DONE";
|
||||
$c->app->log->info($message);
|
||||
$c->flash(success => $result);
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
'wrg_ERROR_WRONG_ACCT_TYPE' => 'The associated account shoult be a user or admin account.',
|
||||
'wrg_ERROR_OCCURED' => 'An error occured',
|
||||
'wrg_CLIENTS_ALREADY_CONFIGURED' => 'You can not alter the server ip, mask, private and public key as there are already some clients configured.',
|
||||
'wrg_NO_CONF' => 'No configured client',
|
||||
'wrg_NO_CONF' => 'No configured clients',
|
||||
'wrg_INTERFACE' => 'Interface',
|
||||
'wrg_CANCELLED' => 'Operation cancelled',
|
||||
'wrg_SUCCESSFULLY_MODIFIED_CONF' => 'Client configuration successfully modified',
|
||||
|
||||
@@ -35,6 +35,7 @@
|
||||
</span>
|
||||
%= $wrg_datas->{wgport}
|
||||
<br></p>
|
||||
<br />
|
||||
|
||||
<table class="sme-border"><tbody>
|
||||
<tr>
|
||||
@@ -91,6 +92,7 @@
|
||||
% if ( scalar @$wgconf == 0 ) {
|
||||
%= l 'wrg_NO_CONF'
|
||||
% } else {
|
||||
<br />
|
||||
<table class="sme-border"><tbody>
|
||||
<tr>
|
||||
<th class='sme-border'>
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
|
||||
Mojolicious Template Code Formatter vmojofmt 0.1.9
|
||||
Input data:
|
||||
Upload a file:
|
||||
(none)
|
||||
Remove empty lines from output
|
||||
Formatted Output:
|
||||
Output Syntax:
|
||||
|
||||
<div id='wrg_mod'>
|
||||
|
||||
%= form_for '/wireguard2' => (method => 'POST') => begin
|
||||
|
||||
@@ -5,17 +5,25 @@
|
||||
%= l 'wrg_DESC_REMOVE_CLIENT'
|
||||
</p>
|
||||
|
||||
<p><br><span class=label>
|
||||
%=l 'wrg_CONF_NAME'
|
||||
</span>
|
||||
<p><span class=label>
|
||||
%= l 'wrg_USER'
|
||||
</span><span class=data>
|
||||
%= $wrg_datas->{account}
|
||||
<br></p>
|
||||
</p>
|
||||
|
||||
<p><span class=label>
|
||||
%= l 'wrg_CONF_NAME'
|
||||
</span><span class=data>
|
||||
%= $wrg_datas->{wgconf}
|
||||
</span>
|
||||
</p>
|
||||
|
||||
<p><span class=label>
|
||||
%= l 'COMMENT'
|
||||
</span>
|
||||
</span><span class=data>
|
||||
%= $wrg_datas->{wgcomment}
|
||||
<br></p>
|
||||
</span>
|
||||
</p>
|
||||
|
||||
<div class="center">
|
||||
%= submit_button l('REMOVE'), name => 'remove', class => 'action left-btn'
|
||||
@@ -23,7 +31,7 @@
|
||||
</div>
|
||||
|
||||
%= hidden_field 'trt' => $wrg_datas->{trt}
|
||||
%= hidden_field 'Wgconf' => $wrg_datas->{account}
|
||||
%= hidden_field 'Wgconf' => $wrg_datas->{wgconf}
|
||||
|
||||
% end
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
%define release 25
|
||||
%define release 28
|
||||
%define version 1.0
|
||||
%define debug_package %{nil}
|
||||
|
||||
@@ -54,13 +54,18 @@ cat %{name}-%{version}-filelist
|
||||
#%doc COPYING
|
||||
|
||||
%post
|
||||
if (systemctl list-unit-files |grep smanager) then
|
||||
echo "Smanager restart in spec file"
|
||||
/sbin/e-smith/signal-event smanager-refresh;
|
||||
fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Oct 03 2025 Brian Read <brianr@koozali.org> 1.0-28.sme
|
||||
- Add in UTF8 to ConfigDB open [SME: 13209]
|
||||
|
||||
* Fri Oct 03 2025 Brian Read <brianr@koozali.org> 1.0-27.sme
|
||||
- Remove smanager-refresh from spec file [SME: 13212]
|
||||
|
||||
* Fri Sep 26 2025 Brian Read <brianr@koozali.org> 1.0-26.sme
|
||||
- Fix remove logic, add in user name to rem panel re-format templates, add space to list panel [SME: 13168]
|
||||
|
||||
* Thu Sep 25 2025 Brian Read <brianr@koozali.org> 1.0-25.sme
|
||||
- Sort outy Remove panel placement and operation of buttons [SME: 13168]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user