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

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

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

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

smeserver-certificates.spec

@@ -1,6 +1,6 @@
 %define name smeserver-certificates
 %define version 11.0
-%define release 4
+%define release 2
 Summary: This is what smeserver-certificates does.
 Name: %{name}
 Version: %{version}
@@ -25,13 +25,6 @@ AutoReqProv: no
 
 
 %changelog
-* Thu Feb 20 2025 Brian Read <brianr@koozali.org> 11.0-4.sme
-- Add local open DB in check on domain sub [SME: 12932]
-
-* 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
 - move smanager panel in package [SME: 12916]
 - add Requires