Compare commits
6 Commits
1.4-11
...
1_4-16_el8
Author | SHA1 | Date | |
---|---|---|---|
252ea1167e | |||
6062ddd8c8 | |||
28c248e0f8 | |||
b736c47e3f | |||
3643affbfe | |||
![]() |
2cd246017d |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -1,4 +1,4 @@
|
|||||||
*.rpm
|
*.rpm
|
||||||
*.log
|
*.log
|
||||||
*spec-20*
|
*spec-20*
|
||||||
*.tar.gz
|
*.tar.xz
|
||||||
|
@@ -7,7 +7,14 @@ SMEServer Koozali developed git repo for smeserver-awstats smecontribs
|
|||||||
<br />https://wiki.koozali.org/Qmail_Statistics_(AWStats)
|
<br />https://wiki.koozali.org/Qmail_Statistics_(AWStats)
|
||||||
|
|
||||||
## Bugzilla
|
## Bugzilla
|
||||||
Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=smeserver-awstats&product=SME%20Contribs&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)
|
Show list of outstanding bugs:
|
||||||
|
[All](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&bug_status=CONFIRMED&bug_status=NEEDINFO&bug_status=IN_PROGRESS&bug_status=RESOLVED&bug_status=VERIFIED&classification=Contribs&component=smeserver-awstats&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)
|
||||||
|
[Confirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=CONFIRMED&classification=Contribs&component=smeserver-awstats&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)
|
||||||
|
[Unconfirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&classification=Contribs&component=smeserver-awstats&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)
|
||||||
|
[Need Info](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=NEEDINFO&classification=Contribs&component=smeserver-awstats&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)
|
||||||
|
[In Progress](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=IN_PROGRESS&classification=Contribs&component=smeserver-awstats&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)
|
||||||
|
[Verified](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=VERIFIED&classification=Contribs&component=smeserver-awstats&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)
|
||||||
|
[Resolved](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=RESOLVED&classification=Contribs&component=smeserver-awstats&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)
|
||||||
|
|
||||||
## Description
|
## Description
|
||||||
|
|
||||||
|
@@ -26,12 +26,12 @@ use SrvMngr qw(theme_list init_session);
|
|||||||
|
|
||||||
use POSIX qw(strftime);
|
use POSIX qw(strftime);
|
||||||
|
|
||||||
use esmith::DomainsDB;
|
use esmith::DomainsDB::UTF8;
|
||||||
use esmith::ConfigDB;
|
use esmith::ConfigDB::UTF8;
|
||||||
|
|
||||||
|
|
||||||
our $ddb = esmith::DomainsDB->open || die "Couldn't open domains db";
|
my $ddb;
|
||||||
our $cdb = esmith::ConfigDB->open || die "Couldn't open configuration db";
|
my $cdb;
|
||||||
|
|
||||||
our $awsdirdata="/home/e-smith/files/users/admin/home/awstats";
|
our $awsdirdata="/home/e-smith/files/users/admin/home/awstats";
|
||||||
our $REGEXP_DOMAIN = qq([a-zA-Z0-9\-\.]+);
|
our $REGEXP_DOMAIN = qq([a-zA-Z0-9\-\.]+);
|
||||||
@@ -44,6 +44,9 @@ sub main {
|
|||||||
my %aws_datas = ();
|
my %aws_datas = ();
|
||||||
my $title = $c->l('aws_FORM_TITLE');
|
my $title = $c->l('aws_FORM_TITLE');
|
||||||
|
|
||||||
|
$ddb = esmith::DomainsDB::UTF8->open || die "Couldn't open domains db";
|
||||||
|
$cdb = esmith::ConfigDB::UTF8->open || die "Couldn't open configuration db";
|
||||||
|
|
||||||
$aws_datas{trt} = 'LST';
|
$aws_datas{trt} = 'LST';
|
||||||
|
|
||||||
my $rec = $cdb->get('AWStats');
|
my $rec = $cdb->get('AWStats');
|
||||||
@@ -100,6 +103,9 @@ sub do_display {
|
|||||||
my $title = $c->l('aws_FORM_TITLE');
|
my $title = $c->l('aws_FORM_TITLE');
|
||||||
my $result;
|
my $result;
|
||||||
|
|
||||||
|
$ddb = esmith::DomainsDB::UTF8->open || die "Couldn't open domains db";
|
||||||
|
$cdb = esmith::ConfigDB::UTF8->open || die "Couldn't open configuration db";
|
||||||
|
|
||||||
my $trt = $c->param('trt') || 'LST';
|
my $trt = $c->param('trt') || 'LST';
|
||||||
my $domain = $c->param('Domain');
|
my $domain = $c->param('Domain');
|
||||||
|
|
||||||
@@ -161,6 +167,9 @@ sub do_update {
|
|||||||
$aws_datas{trt} = $trt;
|
$aws_datas{trt} = $trt;
|
||||||
my ($res, $result) = '';
|
my ($res, $result) = '';
|
||||||
|
|
||||||
|
$ddb = esmith::DomainsDB::UTF8->open || die "Couldn't open domains db";
|
||||||
|
$cdb = esmith::ConfigDB::UTF8->open || die "Couldn't open configuration db";
|
||||||
|
|
||||||
if ( $trt eq 'UPD' ) {
|
if ( $trt eq 'UPD' ) {
|
||||||
|
|
||||||
my $status = $c->param('Status');
|
my $status = $c->param('Status');
|
||||||
@@ -279,7 +288,7 @@ sub do_update {
|
|||||||
return $c->render( 'awstats' );
|
return $c->render( 'awstats' );
|
||||||
}
|
}
|
||||||
|
|
||||||
# $cdb = esmith::ConfigDB->open();
|
# $cdb = esmith::ConfigDB::UTF8->open();
|
||||||
|
|
||||||
my $message = "'AWStats configuration' update ($trt) DONE";
|
my $message = "'AWStats configuration' update ($trt) DONE";
|
||||||
$c->app->log->info($message);
|
$c->app->log->info($message);
|
||||||
@@ -352,4 +361,4 @@ sub language_options_list {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
1
|
1
|
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
% content_for 'module' => begin
|
% content_for 'module' => begin
|
||||||
<div id='module' class='module awstats-panel'>
|
<div id='module' class='module awstats-panel'>
|
||||||
% if ($config->{debug} == 1) {
|
% if (config->{debug} == 1) {
|
||||||
<p>
|
<p>
|
||||||
%= dumper $c->current_route
|
%= dumper $c->current_route
|
||||||
%= dumper $aws_datas
|
%= dumper $aws_datas
|
||||||
|
@@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
%define realname smeserver-awstats
|
%define realname smeserver-awstats
|
||||||
%define version 1.4
|
%define version 1.4
|
||||||
%define release 11
|
%define release 16
|
||||||
|
|
||||||
Summary: SME Server integration rpm for awstats
|
Summary: SME Server integration rpm for awstats
|
||||||
Name: %{realname}
|
Name: %{realname}
|
||||||
@@ -16,8 +16,8 @@ Source: %{name}-%{version}.tar.xz
|
|||||||
BuildRoot: /var/tmp/%{name}-%{version}
|
BuildRoot: /var/tmp/%{name}-%{version}
|
||||||
URL: https://wiki.koozali.org/AWStats
|
URL: https://wiki.koozali.org/AWStats
|
||||||
BuildArchitectures: noarch
|
BuildArchitectures: noarch
|
||||||
BuildRequires: e-smith-devtools >= 1.13.1-03
|
BuildRequires: smeserver-devtools >= 1.13.1-03
|
||||||
Requires: e-smith-release >= 10
|
Requires: smeserver-release >= 10
|
||||||
Requires: awstats >= 6.5
|
Requires: awstats >= 6.5
|
||||||
Requires: perl(POSIX)
|
Requires: perl(POSIX)
|
||||||
AutoReqProv: no
|
AutoReqProv: no
|
||||||
@@ -26,6 +26,21 @@ AutoReqProv: no
|
|||||||
SME Server integration rpm for awstats.
|
SME Server integration rpm for awstats.
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Oct 03 2025 Brian Read <brianr@koozali.org> 1.4-16.sme
|
||||||
|
- Apply UTF8 to DomainDB and ConfigDB and fix potential caching problem [SME: 13209]
|
||||||
|
|
||||||
|
* Fri Oct 03 2025 Brian Read <brianr@koozali.org> 1.4-15.sme
|
||||||
|
- Remove smanager-refresh from spec file [SME: 13212]
|
||||||
|
|
||||||
|
* Wed Sep 24 2025 Brian Read <brianr@koozali.org> 1.4-14.sme
|
||||||
|
- Sort out archive on git stopping local archive update [SME: 13171]
|
||||||
|
|
||||||
|
* Tue Sep 23 2025 Brian Read <brianr@koozali.org> 1.4-13.sme
|
||||||
|
- Change $config to config in layout file(s) [SME: 13171]
|
||||||
|
|
||||||
|
* Sun Sep 08 2024 fix-e-smith-pkg.sh by Trevor Batley <trevor@batley.id.au> 1.4-12.sme
|
||||||
|
- Fix e-smith references in smeserver-awstats [SME: 12732]
|
||||||
|
|
||||||
* Sat Sep 07 2024 cvs2git.sh aka Brian Read <brianr@koozali.org> 1.4-11.sme
|
* Sat Sep 07 2024 cvs2git.sh aka Brian Read <brianr@koozali.org> 1.4-11.sme
|
||||||
- Roll up patches and move to git repo [SME: 12338]
|
- Roll up patches and move to git repo [SME: 12338]
|
||||||
|
|
||||||
@@ -201,10 +216,6 @@ rm -rf %{name}-%{version}
|
|||||||
%pre
|
%pre
|
||||||
%post
|
%post
|
||||||
|
|
||||||
if (systemctl list-unit-files |grep smanager) then
|
|
||||||
echo "Smanager restart in spec file"
|
|
||||||
/sbin/e-smith/signal-event smanager-refresh;
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
|
Reference in New Issue
Block a user