/[smeserver]/rpms/smeserver-manager/sme10/smeserver-manager-0.1.2-bugreport_service.patch
ViewVC logotype

Annotation of /rpms/smeserver-manager/sme10/smeserver-manager-0.1.2-bugreport_service.patch

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

Revision 1.2 - (hide annotations) (download)
Mon Jun 21 15:09:31 2021 UTC (3 years, 4 months ago) by michel
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED 
make: « clog » est à jour.
1 michel 1.1 diff -urN smeserver-manager-0.1.2.old/createlinks smeserver-manager-0.1.2/createlinks
2     --- smeserver-manager-0.1.2.old/createlinks 2021-03-10 12:14:43.000000000 +0400
3     +++ smeserver-manager-0.1.2/createlinks 2021-04-12 19:05:59.732000000 +0400
4     @@ -42,4 +42,5 @@
5     event_link('locales2-conf', "$event", '80');
6     }
7    
8     -event_link('systemd-reload', "smeserver-manager-update", '85');
9     +event_link('systemd-default', "smeserver-manager-update", '88');
10     +event_link('systemd-reload', "smeserver-manager-update", '89');
11     diff -urN smeserver-manager-0.1.2.old/root/etc/e-smith/db/configuration/defaults/smanager/status smeserver-manager-0.1.2/root/etc/e-smith/db/configuration/defaults/smanager/status
12     --- smeserver-manager-0.1.2.old/root/etc/e-smith/db/configuration/defaults/smanager/status 2020-11-19 11:53:26.000000000 +0400
13     +++ smeserver-manager-0.1.2/root/etc/e-smith/db/configuration/defaults/smanager/status 2021-04-12 20:11:57.975000000 +0400
14     @@ -1,2 +1 @@
15     enabled
16     -
17     diff -urN smeserver-manager-0.1.2.old/root/etc/e-smith/db/configuration/migrate/smanager smeserver-manager-0.1.2/root/etc/e-smith/db/configuration/migrate/smanager
18     --- smeserver-manager-0.1.2.old/root/etc/e-smith/db/configuration/migrate/smanager 2020-11-19 11:53:26.000000000 +0400
19     +++ smeserver-manager-0.1.2/root/etc/e-smith/db/configuration/migrate/smanager 2021-04-11 21:34:04.028000000 +0400
20     @@ -22,7 +22,7 @@
21     }
22    
23     my $rec = $DB->get('smanager')
24     - || $DB->new_record('smanager', {type => 'configuration'});
25     + || $DB->new_record('smanager', {type => 'service'});
26    
27     my $pwd = $rec->prop('Secrets');
28     if (not $pwd or length($pwd) < 57){
29     diff -urN smeserver-manager-0.1.2.old/root/usr/lib/systemd/system/smanager.service smeserver-manager-0.1.2/root/usr/lib/systemd/system/smanager.service
30     --- smeserver-manager-0.1.2.old/root/usr/lib/systemd/system/smanager.service 2021-03-10 12:14:43.000000000 +0400
31     +++ smeserver-manager-0.1.2/root/usr/lib/systemd/system/smanager.service 2021-04-12 20:00:21.112000000 +0400
32     @@ -1,15 +1,14 @@
33     [Unit]
34     Description=Server Manager 2 Mojo
35     -Requires=network.target
36     -# httpd.service slapd.service
37     +Requires=network.target httpd-e-smith.service slapd.service
38     After=network.target
39     -# slapd.service
40    
41     [Service]
42     Type=simple
43     SyslogIdentifier=smanager
44     WorkingDirectory=/usr/share/smanager/script
45     PIDFile=/var/run/smanager.pid
46     +ExecStartPre=/sbin/e-smith/service-status smanager
47     ExecStart=/usr/bin/hypnotoad srvmngr -f
48     ExecStop=/usr/bin/hypnotoad -s srvmngr
49     ExecReload=/usr/bin/hypnotoad srvmngr
50     diff -urN smeserver-manager-0.1.2.old/root/usr/lib/systemd/system-preset/80-koozali-smanager.preset smeserver-manager-0.1.2/root/usr/lib/systemd/system-preset/80-koozali-smanager.preset
51     --- smeserver-manager-0.1.2.old/root/usr/lib/systemd/system-preset/80-koozali-smanager.preset 2021-03-10 12:14:43.000000000 +0400
52     +++ smeserver-manager-0.1.2/root/usr/lib/systemd/system-preset/80-koozali-smanager.preset 1970-01-01 04:00:00.000000000 +0400
53     @@ -1,2 +0,0 @@
54     -enable smanager.service
55     -
56     diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm smeserver-manager-0.1.2/root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm
57     --- smeserver-manager-0.1.2.old/root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm 2021-03-10 12:14:43.000000000 +0400
58     +++ smeserver-manager-0.1.2/root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm 2021-03-17 11:40:11.000000000 +0400
59     @@ -23,7 +23,8 @@
60    
61     # Get some basic info on the current SME install
62     our $sysconfig = $cdb->get('sysconfig');
63     -our $systemmode = $sysconfig->prop('PreviousSystemMode');
64     +our $systemmode = $cdb->get('SystemMode')->value;
65     +our $previoussystemmode = $sysconfig->prop('PreviousSystemMode');
66     our $releaseversion = $sysconfig->prop('ReleaseVersion');
67    
68     # Prepare some filehandles for templates and reports
69     @@ -122,6 +123,7 @@
70     releaseversion => \$releaseversion,
71     curkernel => \$curkernel,
72     systemmode => \$systemmode,
73     + previoussystemmode => \$previoussystemmode,
74     newrpms => \@newrpms,
75     templates => \@templates,
76     events => \@events,
77     diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Bugreport/bugreport_en.lex smeserver-manager-0.1.2/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Bugreport/bugreport_en.lex
78     --- smeserver-manager-0.1.2.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Bugreport/bugreport_en.lex 2021-03-10 12:14:44.000000000 +0400
79     +++ smeserver-manager-0.1.2/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Bugreport/bugreport_en.lex 2021-03-17 11:29:38.000000000 +0400
80     @@ -7,6 +7,7 @@
81     'bugr_REPORT_CONTENT' => 'The report will contain the following information',
82     'bugr_SME_VERSION' => 'Koozali SME Server version',
83     'bugr_SERVER_MODE' => 'Server mode',
84     +'bugr_PREVIOUS_SERVER_MODE' => 'Previous server mode',
85     'bugr_KERNEL_AND_ARCH' => 'Current running kernel version and architecture',
86     'bugr_INSTALLED_RPMS' => 'A list of additional RPMs installed on your server',
87     'bugr_ALTERED_TEMPLATES' => 'A list of SME templates that have been altered on your server from a base install',
88     diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Bugreport/bugreport_fr.lex smeserver-manager-0.1.2/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Bugreport/bugreport_fr.lex
89     --- smeserver-manager-0.1.2.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Bugreport/bugreport_fr.lex 2021-03-10 12:14:44.000000000 +0400
90     +++ smeserver-manager-0.1.2/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Bugreport/bugreport_fr.lex 2021-03-17 11:30:09.000000000 +0400
91     @@ -7,6 +7,7 @@
92     'bugr_REPORT_CONTENT' => 'Le rapport contiendra les informations suivantes ',
93     'bugr_SME_VERSION' => 'Version du Serveur Koozali SME',
94     'bugr_SERVER_MODE' => 'Mode d’installation du serveur',
95     +'bugr_PREVIOUS_SERVER_MODE' => 'Mode d’installation précédent du serveur',
96     'bugr_KERNEL_AND_ARCH' => 'Version chargée du kernel et architecture',
97     'bugr_INSTALLED_RPMS' => 'Une liste des RPMs additionnels installés sur votre serveur',
98     'bugr_ALTERED_TEMPLATES' => 'Une liste des gabarits SME qui ont été altérés sur votre serveur par rapport à une installation de base',
99     diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/lib/SrvMngr.pm smeserver-manager-0.1.2/root/usr/share/smanager/lib/SrvMngr.pm
100     --- smeserver-manager-0.1.2.old/root/usr/share/smanager/lib/SrvMngr.pm 2021-03-10 12:14:44.000000000 +0400
101     +++ smeserver-manager-0.1.2/root/usr/share/smanager/lib/SrvMngr.pm 2021-04-12 20:23:03.608000000 +0400
102     @@ -23,7 +23,7 @@
103     use SrvMngr::Model::Main;
104    
105    
106     -our $VERSION = '1.206';
107     +our $VERSION = '1.207';
108     $VERSION = eval $VERSION;
109    
110     use Exporter 'import';
111     diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/bugreport.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/bugreport.html.ep
112     --- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/bugreport.html.ep 2020-11-19 11:53:26.000000000 +0400
113     +++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/bugreport.html.ep 2021-03-17 11:32:06.000000000 +0400
114     @@ -33,6 +33,8 @@
115     </li><li>
116     %=l ('bugr_SERVER_MODE')
117     </li><li>
118     + %=l ('bugr_PREVIOUS_SERVER_MODE')
119     + </li><li>
120     %=l ('bugr_KERNEL_AND_ARCH')
121     </li><li>
122     %=l ('bugr_INSTALLED_RPMS')
123     diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep
124     --- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep 2021-03-10 12:14:44.000000000 +0400
125     +++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep 2021-03-17 12:25:45.651000000 +0400
126     @@ -27,8 +27,6 @@
127     % }
128     </div>
129    
130     - %= include 'partials/_info'
131     -
132     <div id="container">
133    
134     %= content 'js_toggleMenu'
135     @@ -43,6 +41,9 @@
136     % }
137     </div>
138     <div id="main" class="col-md-9">
139     +
140     + %= include 'partials/_info'
141     +
142     % if (flash 'success') {
143     <br><div class=success>
144     %= $c->render_to_string(inline => flash 'success')
145     diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/manual.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/manual.html.ep
146     --- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/manual.html.ep 2020-11-19 11:53:26.000000000 +0400
147     +++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/manual.html.ep 2021-03-14 21:53:05.000000000 +0400
148     @@ -1,9 +1,9 @@
149     % layout 'default', title => 'Sme server 2 - Manual';
150    
151     % content_for 'module' => begin
152     -<div id="central">
153     - <p><h1> <%= $title %> </h1></p>
154     - <%= $modul %><br>
155     +<div id='module'>
156     + <p><h1><%= $title %></h1></p>
157     + %= $c->render_to_string( inline => stash 'modul' )
158     </div>
159    
160     % end
161     diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_header.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_header.html.ep
162     --- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_header.html.ep 2020-11-19 11:53:26.000000000 +0400
163     +++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_header.html.ep 2021-03-17 12:33:07.276000000 +0400
164     @@ -1,7 +1,7 @@
165     <div id="header2" class="hd2">
166     <div id="h2l1">
167     <div id="h2e11">
168     - <img src="images/smeserver_logo.jpg" height="40" alt="SME Server">
169     + <a target='_blank' href="http://www.koozali.org"><img src="images/smeserver_logo.jpg" height="40" alt="SME Server"></a>
170     </div>
171     <div id="h2e12"><h5><a href="/smanager/">Server Manager II</a>
172     <a href="/server-manager" target='main'>&nbsp &nbsp (Previous)</a></h5>
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed