1 |
# $Id: smeserver-manager.spec,v 1.28 2020/06/13 06:08:01 michel Exp $ |
# $Id: smeserver-manager.spec,v 1.44 2021/06/03 19:47:24 michel Exp $ |
2 |
|
|
3 |
Summary: Sme server navigation module : manager 2 |
Summary: Sme server navigation module : manager 2 |
4 |
%define name smeserver-manager |
%define name smeserver-manager |
5 |
Name: %{name} |
Name: %{name} |
6 |
%define version 0.1.0 |
%define version 0.1.2 |
7 |
%define release 26 |
%define release 11 |
8 |
Version: %{version} |
Version: %{version} |
9 |
Release: %{release}%{?dist} |
Release: %{release}%{?dist} |
10 |
License: GPL |
License: GPL |
11 |
Group: Networking/Daemons |
Group: Networking/Daemons |
12 |
Source: %{name}-0.1.0.tar.xz |
Source: %{name}-%{version}.tar.xz |
13 |
Patch0: %{name}-0.1.0-bz10506.patch |
Patch0: %{name}-%{version}-bz11185_initial.patch |
14 |
Patch1: %{name}-add-basic-files.patch |
Patch1: %{name}-%{version}-update_systemd.patch |
15 |
Patch2: %{name}-0.1.0-mojo_struct.patch |
Patch2: %{name}-%{version}-viewlogfiles_download.patch |
16 |
Patch3: %{name}-0.1.0-setuid_groups.patch |
Patch3: %{name}-%{version}-translation_pptp_trailing-slash.patch |
17 |
Patch4: %{name}-0.1.0-reboot_ibays_theme.patch |
Patch4: %{name}-%{version}-locales_menu.patch |
18 |
Patch5: %{name}-0.1.0-add-adminlte.patch |
Patch5: %{name}-%{version}-backup_panels.patch |
19 |
Patch6: %{name}-0.1.0-navigation_header_listes.patch |
Patch6: %{name}-%{version}-bugreport_service.patch |
20 |
Patch7: %{name}-0.1.0-navigation_errors.patch |
Patch7: %{name}-%{version}-theme_switch.patch |
21 |
Patch8: %{name}-0.1.0-theme_navig_message.patch |
Patch8: %{name}-%{version}-public_access.patch |
22 |
Patch9: %{name}-0.1.0-domains_pseudos_hosts.patch |
Patch9: %{name}-%{version}-email_header_locale.patch |
23 |
Patch10: %{name}-0.1.0-remotax_users_logs.patch |
Patch10: %{name}-%{version}-CSRFDefender_cronjob_fail2ban.patch |
|
Patch11: %{name}-0.1.0-localnetworks-panel-remove-adminlte.patch |
|
|
Patch12: %{name}-0.1.0-localnetworks-remove-db-call-from-del.patch |
|
|
Patch13: %{name}-0.1.0-portforwarding-localnetwork-cleanup.patch |
|
|
Patch14: %{name}-0.1.0-portforwarding-rule-comment-missing.patch |
|
|
Patch15: %{name}-0.1.0-yum_backup_email_cleanup.patch |
|
|
Patch16: %{name}-0.1.0-remove_tests.patch |
|
|
Patch17: %{name}-0.1.0-routes_locales_navig.patch |
|
|
Patch18: %{name}-0.1.0-error_success_routes_locales.patch |
|
|
Patch19: %{name}-0.1.0-translation_themes.patch |
|
|
Patch20: %{name}-0.1.0-mojo-app_password_menus.patch |
|
|
Patch21: %{name}-0.1.0-missing_translations.patch |
|
|
Patch22: %{name}-0.1.0-bz9457_bz8903_pseudo_acct_swtheme.patch |
|
|
Patch23: %{name}-0.1.0-start_service.patch |
|
|
|
|
24 |
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot |
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot |
25 |
|
BuildArchitectures: noarch |
26 |
BuildRequires: e-smith-devtools |
BuildRequires: e-smith-devtools |
27 |
BuildRequires: gettext |
BuildRequires: gettext |
28 |
BuildArchitectures: noarch |
#<Build tests> |
29 |
#BuildRequires: gcc |
#BuildRequires: perl >= 0:5.016 |
30 |
|
#BuildRequires: perl(Test::More) |
31 |
|
#BuildRequires: perl(Test::Mojo) |
32 |
|
#BuildRequires: perl(Mojolicious) >= 7.56 |
33 |
|
#BuildRequires: perl(Mojolicious::Plugin::I18N) >= 1.6 |
34 |
|
#BuildRequires: perl(Net::Netmask) >= 1.9 |
35 |
|
#</Build tests> |
36 |
|
|
37 |
Requires: e-smith-lib >= 1.18.0-26 |
Requires: e-smith-lib >= 1.18.0-26 |
38 |
Requires: e-smith-manager >= 2.4.0-22 |
Requires: e-smith-manager >= 2.4.0-22 |
39 |
Requires: perl-Mojolicious >= 6.44 |
Requires: perl(Mojolicious) >= 7.56 |
40 |
Requires: perl-Mojolicious-Plugin-I18N >= 1.6 |
Requires: perl(Mojolicious::Plugin::I18N) >= 1.6 |
41 |
|
Requires: perl(Mojolicious::Plugin::RenderFile) >= 0.12 |
42 |
|
Requires: perl(Mojolicious::Plugin::CSRFDefender) >= 0.0.8 |
43 |
|
Requires: perl(Net::Netmask) >= 1.9 |
44 |
#Requires: js-jquery > 2.2.4-3 (optional) |
#Requires: js-jquery > 2.2.4-3 (optional) |
45 |
Requires: pwauth |
#Requires: pwauth |
46 |
#Requires: perl(Apache::AuthTkt) |
#Requires: perl(Apache::AuthTkt) |
47 |
|
|
48 |
Provides: server-manager |
Provides: server-manager |
49 |
AutoReqProv: no |
AutoReqProv: no |
50 |
|
|
51 |
%define dir_mngr /usr/share/smanager |
%define dir_mngr /usr/share/smanager |
52 |
|
|
|
|
|
53 |
%description |
%description |
54 |
This RPM contributes the navigation bars for the smeserver-manager. |
This RPM contributes the navigation bars for the smeserver-manager. New Mojolicious version. |
55 |
|
|
56 |
%prep |
%prep |
57 |
%setup |
%setup |
66 |
%patch8 -p1 |
%patch8 -p1 |
67 |
%patch9 -p1 |
%patch9 -p1 |
68 |
%patch10 -p1 |
%patch10 -p1 |
|
%patch11 -p1 |
|
|
%patch12 -p1 |
|
|
%patch13 -p1 |
|
|
%patch14 -p1 |
|
|
%patch15 -p1 |
|
|
%patch16 -p1 |
|
|
%patch17 -p1 |
|
|
%patch18 -p1 |
|
|
%patch19 -p1 |
|
|
%patch20 -p1 |
|
|
%patch21 -p1 |
|
|
%patch22 -p1 |
|
|
%patch23 -p1 |
|
69 |
|
|
70 |
%build |
%build |
71 |
perl createlinks |
perl createlinks |
72 |
|
|
73 |
# Force creation of potentially empty directories |
# Force creation of potentially empty directories |
|
##mkdir -p root/etc/e-smith/web/functions2 |
|
74 |
mkdir -p root/etc/e-smith/db/routes |
mkdir -p root/etc/e-smith/db/routes |
75 |
mkdir -p root/home/e-smith/db/navigation2 |
mkdir -p root/home/e-smith/db/navigation2 |
|
#mkdir -p root%{dir_mngr}/html |
|
76 |
mkdir -p root%{dir_mngr}/themes/default/public/css |
mkdir -p root%{dir_mngr}/themes/default/public/css |
77 |
|
|
|
##ln -s /etc/e-smith/web/common/cgi-bin/logout root/%{dir_mngr}/cgi-bin/logout |
|
|
#ln -s %{dir_mngr}/conf/srvmngr.conf root/%{dir_mngr}/srvmngr.conf |
|
|
#ln -s %{dir_mngr}/script/srvmngr.pl root/%{dir_mngr}/srvmngr.pl |
|
|
|
|
|
##gcc -o root/etc/e-smith/web/functions2/wrapper2 manager2.c |
|
|
|
|
|
#for file in index #initial |
|
|
#do |
|
|
# ln -s ../../../functions2/wrapper2 root%{dir_mngr}/html/${file}.cgi |
|
|
#done |
|
|
|
|
|
|
|
78 |
%install |
%install |
79 |
rm -rf $RPM_BUILD_ROOT |
rm -rf $RPM_BUILD_ROOT |
80 |
(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) |
(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) |
83 |
--dir %{dir_mngr} 'attr(0755,root,root)' \ |
--dir %{dir_mngr} 'attr(0755,root,root)' \ |
84 |
--file %{dir_mngr}/log/development.log 'attr(0660,root,admin)' \ |
--file %{dir_mngr}/log/development.log 'attr(0660,root,admin)' \ |
85 |
--file %{dir_mngr}/log/production.log 'attr(0660,root,admin)' \ |
--file %{dir_mngr}/log/production.log 'attr(0660,root,admin)' \ |
86 |
|
--file %{dir_mngr}/script/daily.sh 'attr(0770,root,root)' \ |
87 |
|
--file %{dir_mngr}/script/routes.pl 'attr(0770,root,root)' \ |
88 |
|
--file %{dir_mngr}/script/secrets.pl 'attr(0770,root,root)' \ |
89 |
> %{name}-%{version}-%{release}-filelist |
> %{name}-%{version}-%{release}-filelist |
90 |
|
|
91 |
#--file /etc/e-smith/web/functions2/wrapper2 'attr(4750,root,admin)' \ |
echo "%doc COPYING f2b/*" >> %{name}-%{version}-%{release}-filelist |
|
#--file /etc/e-smith/web/functions2/index.cgi 'attr(0500,root,root)' \ |
|
|
#--file %{dir_mngr}/html/index.cgi 'attr(root,admin)' \ |
|
|
|
|
|
echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist |
|
92 |
|
|
93 |
|
%check |
94 |
|
#cd $RPM_BUILD_ROOT/%{dir_mngr} && QUICK_TEST=1 /usr/bin/prove -q -l -r |
95 |
|
|
96 |
%clean |
%clean |
97 |
rm -rf $RPM_BUILD_ROOT |
rm -rf $RPM_BUILD_ROOT |
99 |
%pre |
%pre |
100 |
|
|
101 |
%preun |
%preun |
|
# js-jquery from epel |
|
|
##if (rpm -q js-jquery > /dev/null 2>&1) |
|
102 |
if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ] |
if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ] |
103 |
then |
then |
104 |
unlink %{dir_mngr}/themes/default/public/js/jquery.min.js |
unlink %{dir_mngr}/themes/default/public/js/jquery.min.js |
105 |
fi |
fi |
|
systemctl disable smanager.service |
|
106 |
true |
true |
107 |
|
|
108 |
%post |
%post |
|
# js-jquery from epel |
|
|
##if (rpm -q js-jquery > /dev/null 2>&1) |
|
109 |
if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ] |
if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ] |
110 |
then |
then |
111 |
mkdir %{dir_mngr}/themes/default/public/js |
mkdir %{dir_mngr}/themes/default/public/js |
112 |
ln -s /usr/share/javascript/jquery/latest/jquery.min.js %{dir_mngr}/themes/default/public/js/jquery.min.js |
ln -s /usr/share/javascript/jquery/latest/jquery.min.js %{dir_mngr}/themes/default/public/js/jquery.min.js |
113 |
fi |
fi |
|
/sbin/e-smith/expand-template /usr/share/smanager/conf/srvmngr.conf |
|
|
/sbin/e-smith/expand-template /etc/systemd/system/smanager.service |
|
|
systemctl enable smanager.service |
|
|
systemctl restart smanager.srvice |
|
114 |
true |
true |
115 |
|
|
116 |
%postun |
%postun |
118 |
%defattr(-,root,root) |
%defattr(-,root,root) |
119 |
|
|
120 |
%changelog |
%changelog |
121 |
|
* Tue Jun 08 2021 Michel Begue <mab974@gmail.com> 0.1.2-11.sme |
122 |
|
- Add cron job for secrets and routes purge |
123 |
|
- Add CSRFDefender plugin against CSRF attacks |
124 |
|
- Add optional fail2ban configuration files in doc |
125 |
|
- Fix zh-tw locale file name |
126 |
|
- Fix missing links in 'Bugreport' |
127 |
|
- Fix copyright in footer |
128 |
|
- Fix translations |
129 |
|
|
130 |
|
* Thu Jun 03 2021 Michel Begue <mab974@gmail.com> 0.1.2-10.sme |
131 |
|
- Add header for contrib in layout |
132 |
|
- fix emailsettings error 'webmail is only SSL' [SME: 11443] |
133 |
|
- fix locale files |
134 |
|
- clean up template files |
135 |
|
|
136 |
|
* Wed Apr 21 2021 Michel Begue <mab974@gmail.com> 0.1.2-9.sme |
137 |
|
- Add access attribute in configuration base |
138 |
|
- Verify modes and access compatibility |
139 |
|
- Display theme_switch button to logged in users only [SME: 11571] |
140 |
|
|
141 |
|
* Tue Apr 20 2021 Michel Begue <mab974@gmail.com> 0.1.2-8.sme |
142 |
|
- Fix 'theme switch' [SME: 11571] |
143 |
|
|
144 |
|
* Mon Apr 12 2021 Michel Begue <mab974@gmail.com> 0.1.2-7.sme |
145 |
|
- Fix server-mode in bugreport [SME: 10448] |
146 |
|
- Add systemd-default for smanager type (service) [SME: 11544] |
147 |
|
- Fix smanager type and status in db |
148 |
|
- Move initial security notification to central place |
149 |
|
- Render 'Manual' output in template |
150 |
|
- Add a link to koozali.org on Sme logo |
151 |
|
|
152 |
|
* Mon Jan 25 2021 Michel Begue <mab974@gmail.com> 0.1.2-6.sme |
153 |
|
- Fix missing backup functions |
154 |
|
- background mode for halt and reboot |
155 |
|
- Store debug mode in ENV |
156 |
|
- Add a warning mode notification |
157 |
|
- Fix some translations needing to be escaped |
158 |
|
|
159 |
|
* Wed Jan 13 2021 Michel Begue <mab974@gmail.com> 0.1.2-5.sme |
160 |
|
- Fix menu items not translated [SME: 11322] |
161 |
|
- Add other locales files |
162 |
|
|
163 |
|
* Thu Jan 07 2021 Michel Begue <mab974@gmail.com> 0.1.2-4.sme |
164 |
|
- Fix 404 error when trailing slash is missing |
165 |
|
- Fix missing translations for ibay and quota panels |
166 |
|
- Comment out pptp settings in remoteaccess panel |
167 |
|
- Fix 'sigusr1' exec for httpd [SME: 11185] |
168 |
|
|
169 |
|
* Tue Dec 01 2020 Michel Begue <mab974@gmail.com> 0.1.2-3.sme |
170 |
|
- Fix download error on 'viewlogfiles' panel [SME: 11217] |
171 |
|
- Fix duplicate entries in log files to be chosen |
172 |
|
- Fix duplicate translation terms in 'General' lexicon |
173 |
|
|
174 |
|
* Fri Nov 20 2020 Michel Begue <mab974@gmail.com> 0.1.2-2.sme |
175 |
|
- Fix smanager-update event name |
176 |
|
- Move smanager service to /usr/lib/systemd |
177 |
|
- Fix Bugreport file download |
178 |
|
- Fix translations missing in 'viewlogfiles' |
179 |
|
- Remove Admin auth in httpd configuration |
180 |
|
- Add an optional alias for admin sign in. |
181 |
|
- Remove systemctl from .spec file |
182 |
|
|
183 |
|
* Thu Nov 19 2020 Michel Begue <mab974@gmail.com> 0.1.2-1.sme |
184 |
|
- Create new version smeserver-manager-0.1.2-1 (= 0.1.0-31) |
185 |
|
|
186 |
|
* Wed Oct 07 2020 Michel Begue <mab974@gmail.com> 0.1.0-31.sme |
187 |
|
- smanager-refresh event come back |
188 |
|
- add smanager version in footer |
189 |
|
- add optional refresh in layout |
190 |
|
- fix yum logfile displaying |
191 |
|
|
192 |
|
* Mon Oct 05 2020 Michel Begue <mab974@gmail.com> 0.1.0-30.sme |
193 |
|
- fix I18N Namespace change for keeping Language |
194 |
|
- clean up emailsettings code |
195 |
|
- remove old global lexicon files |
196 |
|
- add first simple tests |
197 |
|
- add smanager-update event |
198 |
|
|
199 |
|
* Mon Aug 17 2020 Michel Begue <mab974@gmail.com> 0.1.0-29.sme |
200 |
|
- validate lexicon file before install |
201 |
|
- fix route url construction (+) |
202 |
|
- add authentication messages to locales |
203 |
|
|
204 |
|
* Fri Aug 07 2020 Michel Begue <mab974@gmail.com> 0.1.0-28.sme |
205 |
|
- validate netmask in LocalNetworks [SME: 10976] |
206 |
|
- validate netmask in RemoteAccess [SME: 10977] |
207 |
|
- prettier action button |
208 |
|
- accept undescore in lexicon name |
209 |
|
- change route urls for LocalNetworks and Portforwarding |
210 |
|
- add rendering to LocalNetworks notification |
211 |
|
|
212 |
|
* Mon Jul 06 2020 Michel Begue <mab974@gmail.com> 0.1.0-27.sme |
213 |
|
- Fix typo in %post here |
214 |
|
- Complete 'datetime' panel |
215 |
|
- Fix notification in 'quota' panel |
216 |
|
|
217 |
* Wed Jul 01 2020 Michel Begue <mab974@gmail.com> 0.1.0-26.sme |
* Wed Jul 01 2020 Michel Begue <mab974@gmail.com> 0.1.0-26.sme |
218 |
- Fix first start error |
- Fix first start error |
219 |
- Fix incorrect messages and various typos in modules |
- Fix incorrect messages and various typos in modules |