/[smecontribs]/rpms/smeserver-awstats/contribs10/smeserver-awstats-1.4-bz11045.patch
ViewVC logotype

Annotation of /rpms/smeserver-awstats/contribs10/smeserver-awstats-1.4-bz11045.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.3 - (hide annotations) (download)
Mon Feb 22 20:43:18 2021 UTC (3 years, 9 months ago) by jpp
Branch: MAIN
Changes since 1.2: +75 -2 lines 
* Mon Feb 22 2021 Jean-Philipe Pialasse <tests@pialasse.com> 1.4-3.sme
- add update event for easy install [SME: 11045]
  rewrite spec and createlinks to be more smeserver compliant
- run actions/awstats-upgrade on update of awstats or smeserver-awstats [SME: 10784]
1 jpp 1.1 diff -Nur smeserver-awstats-1.4.old/createlinks smeserver-awstats-1.4/createlinks
2     --- smeserver-awstats-1.4.old/createlinks 2007-04-06 00:59:44.000000000 -0400
3 jpp 1.3 +++ smeserver-awstats-1.4/createlinks 2021-02-22 15:26:36.940000000 -0500
4 jpp 1.1 @@ -3,15 +3,29 @@
5     use esmith::Build::CreateLinks qw(:all);
6     use File::Basename;
7     use File::Path;
8     -
9     -panel_link("awstats", 'manager');
10     -
11     -event_link("conf-awstats", 'console-save', "60");
12     -event_link("conf-awstats", 'remoteaccess-update', "85");
13    
14     -event_link("awstats-run", "ip-change", "60");
15     -event_link("conf-awstats", "ip-change", "61");
16 jpp 1.2 +my $event;
17 jpp 1.1
18     -event_link("conf-awstats", "awstats-update", "10");
19     +panel_link("awstats", 'manager');
20     +
21 jpp 1.2 +$event="console-save";
22 jpp 1.1 +templates2events("/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf", $event );
23     +
24 jpp 1.2 +$event="remoteaccess-update";
25 jpp 1.1 +templates2events("/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf", $event );
26     +
27 jpp 1.2 +$event="ip-change";
28 jpp 1.1 +templates2events("/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf", $event );
29 jpp 1.2 +event_link("awstats-run", $event , "04");
30 jpp 1.1 +
31 jpp 1.2 +$event="awstats-update";
32 jpp 1.1 +event_link("navigation-conf", $event, "50");
33     +templates2events("/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf", $event );
34     event_link("awstats-run", "awstats-update", "20");
35    
36     +
37 jpp 1.3 +$event= "smeserver-awstats-update";
38 jpp 1.1 +event_link("navigation-conf", $event, "50");
39     +templates2events("/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf", $event );
40     +templates2events("/etc/crontab", $event );
41     +event_link("awstats-upgrade", $event, "02");
42     diff -Nur smeserver-awstats-1.4.old/root/etc/e-smith/db/configuration/defaults/AWStats/status smeserver-awstats-1.4/root/etc/e-smith/db/configuration/defaults/AWStats/status
43     --- smeserver-awstats-1.4.old/root/etc/e-smith/db/configuration/defaults/AWStats/status 1969-12-31 19:00:00.000000000 -0500
44     +++ smeserver-awstats-1.4/root/etc/e-smith/db/configuration/defaults/AWStats/status 2021-02-22 14:38:52.409000000 -0500
45     @@ -0,0 +1 @@
46     +enabled
47     diff -Nur smeserver-awstats-1.4.old/root/etc/e-smith/db/configuration/defaults/AWStats/type smeserver-awstats-1.4/root/etc/e-smith/db/configuration/defaults/AWStats/type
48     --- smeserver-awstats-1.4.old/root/etc/e-smith/db/configuration/defaults/AWStats/type 1969-12-31 19:00:00.000000000 -0500
49     +++ smeserver-awstats-1.4/root/etc/e-smith/db/configuration/defaults/AWStats/type 2021-02-22 14:38:40.451000000 -0500
50     @@ -0,0 +1 @@
51     +status
52 jpp 1.3 diff -Nur smeserver-awstats-1.4.old/root/etc/e-smith/events/actions/awstats-upgrade smeserver-awstats-1.4/root/etc/e-smith/events/actions/awstats-upgrade
53     --- smeserver-awstats-1.4.old/root/etc/e-smith/events/actions/awstats-upgrade 2018-07-18 10:30:22.000000000 -0400
54     +++ smeserver-awstats-1.4/root/etc/e-smith/events/actions/awstats-upgrade 2021-02-22 15:41:43.860000000 -0500
55     @@ -1,10 +1,19 @@
56     #!/bin/bash
57    
58     -cp -a /var/www/awstats/icon/* /etc/e-smith/web/panels/manager/html/awstats/icon
59     -cp -a /var/www/awstats/awstats.pl /etc/e-smith/web/panels/manager/cgi-bin/.awstats
60     -cp -a /var/www/awstats/lang /etc/e-smith/web/panels/manager/cgi-bin/.awstats
61     -cp -a /var/www/awstats/lib /etc/e-smith/web/panels/manager/cgi-bin/.awstats
62     -cp -a /var/www/awstats/plugins /etc/e-smith/web/panels/manager/cgi-bin/.awstats
63     +if [[ -d /var/www/awstats/ ]]; then
64     + cp -a /var/www/awstats/icon/* /etc/e-smith/web/panels/manager/html/awstats/icon
65     + cp -a /var/www/awstats/awstats.pl /etc/e-smith/web/panels/manager/cgi-bin/.awstats
66     + cp -a /var/www/awstats/lang /etc/e-smith/web/panels/manager/cgi-bin/.awstats
67     + cp -a /var/www/awstats/lib /etc/e-smith/web/panels/manager/cgi-bin/.awstats
68     + cp -a /var/www/awstats/plugins /etc/e-smith/web/panels/manager/cgi-bin/.awstats
69     +else
70     + rootdir='/usr/share/awstats/'
71     + cp -a $rootdir/wwwroot/icon/* /etc/e-smith/web/panels/manager/html/awstats/icon
72     + cp -a $rootdir/wwwroot/cgi-bin/awstats.pl /etc/e-smith/web/panels/manager/cgi-bin/.awstats
73     + cp -a $rootdir/lang /etc/e-smith/web/panels/manager/cgi-bin/.awstats
74     + cp -a $rootdir/lib /etc/e-smith/web/panels/manager/cgi-bin/.awstats
75     + cp -a $rootdir/plugins /etc/e-smith/web/panels/manager/cgi-bin/.awstats
76     +fi
77     chmod -R 770 /etc/e-smith/web/panels/manager/cgi-bin/.awstats
78    
79     #cd /etc/e-smith/web/panels/manager/html/awstats/
80     diff -Nur smeserver-awstats-1.4.old/root/etc/e-smith/events/actions/conf-awstats smeserver-awstats-1.4/root/etc/e-smith/events/actions/conf-awstats
81     --- smeserver-awstats-1.4.old/root/etc/e-smith/events/actions/conf-awstats 2018-07-18 10:30:23.000000000 -0400
82     +++ smeserver-awstats-1.4/root/etc/e-smith/events/actions/conf-awstats 1969-12-31 19:00:00.000000000 -0500
83     @@ -1,41 +0,0 @@
84     -#!/usr/bin/perl -w
85     -
86     -#----------------------------------------------------------------------
87     -# copyright (C) 2001 neddix
88     -#
89     -# This program is free software; you can redistribute it and/or modify
90     -# it under the terms of the GNU General Public License as published by
91     -# the Free Software Foundation; either version 2 of the License, or
92     -# (at your option) any later version.
93     -#
94     -# This program is distributed in the hope that it will be useful,
95     -# but WITHOUT ANY WARRANTY; without even the implied warranty of
96     -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
97     -# GNU General Public License for more details.
98     -#
99     -# You should have received a copy of the GNU General Public License
100     -# along with this program; if not, write to the Free Software
101     -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
102     -#----------------------------------------------------------------------
103     -
104     -package esmith;
105     -
106     -use strict;
107     -use esmith::config;
108     -use esmith::util;
109     -
110     -esmith::templates::processTemplate(
111     - {
112     - TEMPLATE_PATH => '/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf',
113     - OUTPUT_FILENAME => "/etc/e-smith/web/panels/manager/cgi-bin/.awstats/awstats.conf",
114     - }
115     -);
116     -
117     -esmith::templates::processTemplate(
118     - {
119     - TEMPLATE_PATH => '/etc/crontab',
120     - OUTPUT_FILENAME => "/etc/crontab",
121     - }
122     -);
123     -
124     -exit (0);
125 jpp 1.1 diff -Nur smeserver-awstats-1.4.old/root/etc/yum/post-actions/awstats.action smeserver-awstats-1.4/root/etc/yum/post-actions/awstats.action
126     --- smeserver-awstats-1.4.old/root/etc/yum/post-actions/awstats.action 1969-12-31 19:00:00.000000000 -0500
127     +++ smeserver-awstats-1.4/root/etc/yum/post-actions/awstats.action 2021-02-22 15:02:23.606000000 -0500
128     @@ -0,0 +1,2 @@
129     +awstats:install:/etc/e-smith/events/actions/awstats-upgrade
130     +awstats:update:/etc/e-smith/events/actions/awstats-upgrade
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed