smeserver/smeserver-certificates
6
0
Fork 0
generated from smedev/Template-for-SMEServer-Core-Package
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Mon Feb 17 2025 Brian Read <brianr@koozali.org> 11.0-3.sme

Browse Source 
- Change status in template to use helper script to pre-set dropdown value  [SME: 12923]
- Update Custom routines to openb DB when required, not relying on global open [SME: 12695]
This commit is contained in:
Brian Read 2025-02-17 11:45:04 +00:00
parent 26aa5253cc
commit 444fc11ead
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
root/usr/share/smanager/lib/SrvMngr/Controller/Letsencrypt-Custom.pm
View File

@ -16,11 +16,11 @@ use constant FALSE => 0;
use constant TRUE => 1; use constant TRUE => 1;
#The most common ones #The most common ones
our $cdb = esmith::ConfigDB->open() || die("Couldn't open config db"); #our $cdb = esmith::ConfigDB->open() || die("Couldn't open config db");
our $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db"); #our $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db");
our $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db"); #our $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
our $hdb = esmith::HostsDB->open() || die("Couldn't open Hosts db"); #our $hdb = esmith::HostsDB->open() || die("Couldn't open Hosts db");
our $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db"); #our $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db");
# Validation routines - parameters for each panel # Validation routines - parameters for each panel
sub validate_LIST { sub validate_LIST {
@ -161,6 +161,7 @@ sub validate_CHECKONEDOMAIN {
# Get singleton data for each panel # Get singleton data for each panel
sub get_data_for_panel_LIST { sub get_data_for_panel_LIST {
my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db");
# Return a hash with the fields required which will be loaded into the shared data # Return a hash with the fields required which will be loaded into the shared data
my $c = shift; my $c = shift;
@ -185,6 +186,7 @@ sub get_data_for_panel_PARAMS {
# Return a hash with the fields required which will be loaded into the shared data # Return a hash with the fields required which will be loaded into the shared data
my $c = shift; my $c = shift;
my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db");
my %ret = ( my %ret = (
'Data1' => 'Data for PARAMS', #Example 'Data1' => 'Data for PARAMS', #Example
# fields from Inputs in PARAMS $fields['PARAMS'] # fields from Inputs in PARAMS $fields['PARAMS']
@ -272,6 +274,8 @@ sub actual_DomainList {
# #print $element . "\n"; # #print $element . "\n";
# push @list, $element; # push @list, $element;
# } # }
my $ddb = esmith::DomainsDB->open() || die("Couldn't open Domains db");
my $hdb = esmith::HostsDB->open() || die("Couldn't open Hosts db");
my @data = (); my @data = ();
my $check = $c->l('Check Domain'); my $check = $c->l('Check Domain');
@ -440,6 +444,7 @@ sub perform_PARAMS {
my $c = shift; my $c = shift;
my $prefix_data = shift; #Data hash as parameter my $prefix_data = shift; #Data hash as parameter
my $ret = ""; my $ret = "";
my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db");
my $db = $cdb; #maybe one of the others my $db = $cdb; #maybe one of the others
my $dbkey = 'letsencrypt'; my $dbkey = 'letsencrypt';
@ -480,6 +485,7 @@ sub perform_CHECKALLDOMAINS {
my $c = shift; my $c = shift;
my $prefix_data = shift; #Data hash as parameter my $prefix_data = shift; #Data hash as parameter
my $ret = ""; my $ret = "";
my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db");
my $db = $cdb; #maybe one of the others my $db = $cdb; #maybe one of the others
my $dbkey = 'ChangeThis'; my $dbkey = 'ChangeThis';
@ -496,6 +502,7 @@ sub perform_CHECKALLENABLEDDOMAINS {
my $c = shift; my $c = shift;
my $prefix_data = shift; #Data hash as parameter my $prefix_data = shift; #Data hash as parameter
my $ret = ""; my $ret = "";
my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db");
my $db = $cdb; #maybe one of the others my $db = $cdb; #maybe one of the others
my $dbkey = 'ChangeThis'; my $dbkey = 'ChangeThis';

5
root/usr/share/smanager/themes/default/templates/partials/_lets_PARAMS.html.ep
View File

@ -27,8 +27,9 @@
<p><span class=label> <p><span class=label>
%=l('lets_SERVICE_STATUS') %=l('lets_SERVICE_STATUS')
</span><span class=data> </span><span class=data>
% my @status_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled'], ['TEST' => 'test']]; %# my @status_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled'], ['TEST' => 'test']];
% param 'status' => $lets_data->{status} unless param 'status'; % my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled'], ['TEST' => 'test']], $lets_data->{status});
%# param 'status' => $lets_data->{status} unless param 'status';
%= select_field 'status' => @status_options, class => 'input' %= select_field 'status' => @status_options, class => 'input'
<br></span> </p> <br></span> </p>

6
smeserver-certificates.spec
View File

@ -1,6 +1,6 @@
%define name smeserver-certificates %define name smeserver-certificates
%define version 11.0 %define version 11.0
%define release 2 %define release 3
Summary: This is what smeserver-certificates does. Summary: This is what smeserver-certificates does.
Name: %{name} Name: %{name}
Version: %{version} Version: %{version}
@ -25,6 +25,10 @@ AutoReqProv: no
%changelog %changelog
* Mon Feb 17 2025 Brian Read <brianr@koozali.org> 11.0-3.sme
- Change status in template to use helper script to pre-set dropdown value [SME: 12923]
- Update Custom routines to openb DB when required, not relying on global open [SME: 12695]
* Wed Feb 12 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0-2.sme * Wed Feb 12 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0-2.sme
- move smanager panel in package [SME: 12916] - move smanager panel in package [SME: 12916]
- add Requires - add Requires