--- rpms/smeserver-manager/sme10/smeserver-manager.spec 2020/04/07 17:56:02 1.18 +++ rpms/smeserver-manager/sme10/smeserver-manager.spec 2020/04/11 17:08:20 1.19 @@ -1,30 +1,31 @@ -# $Id: smeserver-manager.spec,v 1.17 2020/04/07 13:29:49 brianr Exp $ +# $Id: smeserver-manager.spec,v 1.18 2020/04/07 17:56:02 brianr Exp $ Summary: Sme server navigation module : manager 2 %define name smeserver-manager Name: %{name} %define version 0.1.0 -%define release 15 +%define release 16 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.xz -Patch0: smeserver-manager-0.1.0-bz10506.patch -Patch1: smeserver-manager-add-basic-files.patch -Patch2: smeserver-manager-0.1.0-mojo_struct.patch -Patch3: smeserver-manager-0.1.0-setuid_groups.patch -Patch4: smeserver-manager-0.1.0-reboot_ibays_theme.patch -Patch5: smeserver-manager-0.1.0-add-adminlte.patch -Patch6: smeserver-manager-0.1.0-navigation_header_listes.patch -Patch7: smeserver-manager-0.1.0-navigation_errors.patch -Patch8: smeserver-manager-0.1.0-theme_navig_message.patch -Patch9: smeserver-manager-0.1.0-domains_pseudos_hosts.patch -Patch10: smeserver-manager-0.1.0-remotax_users_logs.patch -Patch11: smeserver-manager-0.1.0-localnetworks-panel-remove-adminlte.patch -Patch12: smeserver-manager-0.1.0-localnetworks-remove-db-call-from-del.patch -Patch13: smeserver-manager-0.1.0-portforwarding-localnetwork-cleanup.patch -Patch14: smeserver-manager-0.1.0-portforwarding-rule-comment-missing.patch +Patch0: %{name}-0.1.0-bz10506.patch +Patch1: %{name}-add-basic-files.patch +Patch2: %{name}-0.1.0-mojo_struct.patch +Patch3: %{name}-0.1.0-setuid_groups.patch +Patch4: %{name}-0.1.0-reboot_ibays_theme.patch +Patch5: %{name}-0.1.0-add-adminlte.patch +Patch6: %{name}-0.1.0-navigation_header_listes.patch +Patch7: %{name}-0.1.0-navigation_errors.patch +Patch8: %{name}-0.1.0-theme_navig_message.patch +Patch9: %{name}-0.1.0-domains_pseudos_hosts.patch +Patch10: %{name}-0.1.0-remotax_users_logs.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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools BuildRequires: gettext @@ -35,12 +36,23 @@ Requires: perl-Mojolicious >= 6.44 Requires: perl-Mojolicious-Plugin-I18N >= 1.6 Requires: pwauth Requires: perl(Apache::AuthTkt) -#Requires: smeserver-manager-html -#Provides: server-manager2 +#Requires: js-jquery > 2.2.4-3 (optional) +Provides: server-manager2 AutoReqProv: no +%define dir_mngr /etc/e-smith/web/panels/manager2 + %changelog -* Tue Apr 07 2020 Brian Read 0.1.0-14.sme +* Sat Apr 11 2020 Michel Begue 0.1.0-16.sme +- Add panels : emailaccess, yum, backup +- Fix Rendering comments in portforwarding & localnetworks panels +- Css and images files added (from manager). +- Initial javascript in navigation added (jQuery) -optional- +- Add 'Heading...' navigation informations in controllers +- Remove wbl and account tests +- Show Themes_switch if there is more than one theme + +* Tue Apr 07 2020 Brian Read 0.1.0-15.sme - Sort out rule comment in portforwarding add panel * Tue Apr 07 2020 Brian Read 0.1.0-14.sme @@ -841,112 +853,64 @@ This RPM contributes the navigation bars %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 %build -# Force creation of potentially empty directories perl createlinks + +# Force creation of potentially empty directories mkdir -p root/etc/e-smith/web/functions2 mkdir -p root/home/e-smith/db/navigation -mkdir -p root/etc/e-smith/web/common/css -mkdir -p root/etc/e-smith/web/panels/manager2/{cgi-bin,html} -mkdir -p root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/images -#mkdir -p root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/AdminLTE/public{css,images,js,tmp} -#mkdir -p root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/AdminLTE/templates/{layouts,partials} +mkdir -p root%{dir_mngr}/html +mkdir -p root%{dir_mngr}/cgi-bin/srvmngr/themes/default/public/css -gcc -o root/etc/e-smith/web/functions2/wrapper2 manager2.c +ln -s /etc/e-smith/web/common/cgi-bin/logout root/%{dir_mngr}/cgi-bin/logout +ln -s %{dir_mngr}/cgi-bin/srvmngr/conf/srvmngr.conf root/%{dir_mngr}/cgi-bin/srvmngr/srvmngr.conf +ln -s %{dir_mngr}/cgi-bin/srvmngr/script/srvmngr.pl root/%{dir_mngr}/cgi-bin/srvmngr/srvmngr.pl -#mkdir -p root/usr/share/locale/en_US/LC_MESSAGES/ -#xgettext -o root/usr/share/locale/en_US/LC_MESSAGES/foot.tmpl.po root/etc/e-smith/templates/etc/e-smith/web/common/foot.tmpl/25Copyright -## make header/footer symlinks -#ln -s head.tmpl root/etc/e-smith/web/common/userpassword_head.tmpl -#ln -s head.tmpl root/etc/e-smith/web/common/noframes_head.tmpl -#ln -s foot.tmpl root/etc/e-smith/web/common/noframes_foot.tmpl +gcc -o root/etc/e-smith/web/functions2/wrapper2 manager2.c -#mkdir -p root/etc/e-smith/web/panels/manager2/html for file in index #initial do - ln -s ../../../functions2/wrapper2 root/etc/e-smith/web/panels/manager2/html/${file}.cgi + ln -s ../../../functions2/wrapper2 root%{dir_mngr}/html/${file}.cgi done -# Force creation of potentially empty directories -#mkdir -p root/etc/httpd/admin-conf -#mkdir -p root/service -#mkdir -p root/etc/rc.d/init.d/supervise -#for service in httpd-admin -#do -# ln -s /var/service/$service root/service/$service -# mkdir -p root/var/service/$service/supervise -# touch root/var/service/$service/down -# if [ -d root/var/service/$service/log ] -# then -# mkdir -p root/var/service/$service/log/supervise -# mkdir -p root/var/log/$service -# fi -# ln -s ../daemontools root/etc/rc.d/init.d/supervise/$service -#done %install rm -rf $RPM_BUILD_ROOT (cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) rm -f %{name}-%{version}-%{release}-filelist /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ ---file /etc/e-smith/web/panels/manager2/cgi-bin/wbl 'attr(4750,root,admin)' \ ---file /etc/e-smith/web/panels/manager2/cgi-bin/useraccounts 'attr(4750,root,admin)' \ ---dir /etc/e-smith/web/panels/manager2 'attr(0755,root,root)' \ +--dir %{dir_mngr} 'attr(0755,root,root)' \ --file /etc/e-smith/web/functions2/wrapper2 'attr(4750,root,admin)' \ --file /etc/e-smith/web/functions2/index.cgi 'attr(0500,root,root)' \ +--file %{dir_mngr}/html/index.cgi 'attr(root,admin)' \ +--file %{dir_mngr}/cgi-bin/srvmngr/log/development.log 'attr(0660,root,admin)' \ > %{name}-%{version}-%{release}-filelist echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist -# Samples only -# --file /etc/e-smith/web/common/cgi-bin/login 'attr(0755,root,root)' \ -# --file /etc/e-smith/web/common/cgi-bin/logout 'attr(0755,root,root)' \ -# --file /etc/e-smith/web/functions/wrapper 'attr(4750,root,admin)' \ -# --dir /var/service/httpd-admin 'attr(01755,root,root)' \ -# --file /var/service/httpd-admin/down 'attr(0644,root,root)' \ -# --file /var/service/httpd-admin/run 'attr(0755,root,root)' \ -# --dir /var/service/httpd-admin/log 'attr(0755,root,root)' \ -# --dir /var/service/httpd-admin/log/supervise 'attr(0700,root,root)' \ -# --dir /var/service/httpd-admin/supervise 'attr(0700,root,root)' \ -# --file /var/service/httpd-admin/log/run 'attr(0755,root,root)' \ -# --dir /var/log/httpd-admin 'attr(0750,smelog,smelog)' \ -# > %{name}-%{version}-%{release}-filelist - %clean rm -rf $RPM_BUILD_ROOT %pre + %preun -#rm -f /etc/e-smith/web/panels/manager2/srvmngr/public/css/sme_core.css -#rm -f /etc/e-smith/web/panels/manager2/srvmngr/public/images/btn_donateCC_LG.gif -#rm -f /etc/e-smith/web/panels/manager2/cgi-bin/logout +# js-jquery from epel +##if (rpm -q js-jquery > /dev/null 2>&1) +if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ] +then + unlink %{dir_mngr}/cgi-bin/srvmngr/themes/default/public/js/jquery.min.js +fi %post -#find /etc/e-smith/web/panels/manager/cgi-bin/ -type f | \ -# sed -n '/\/[0-9a-z]\{32\}$/p' | \ -# xargs grep -l Persisten | \ -# xargs rm -f -ln -s /etc/e-smith/web/common/css/sme_core.css /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/css/sme_core.css -ln -s /etc/e-smith/web/common/css/sme_main.css /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/css/sme_main.css -ln -s /etc/e-smith/web/common/css/sme_menu.css /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/css/sme_menu.css -ln -s /etc/e-smith/web/common/btn_donateCC_LG.gif /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/images/btn_donateCC_LG.gif -ln -s /etc/e-smith/web/common/smeserver_logo.jpg /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/images/smeserver_logo.jpg -ln -s /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/conf/srvmngr.conf /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/srvmngr.conf -ln -s /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/script/srvmngr.pl /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/srvmngr.pl -ln -s /etc/e-smith/web/common/cgi-bin/logout /etc/e-smith/web/panels/manager2/cgi-bin/logout -/sbin/e-smith/expand-template /etc/httpd/admin-conf/httpd.conf -chmod 0755 /etc/e-smith/web/panels/manager2/html/index.cgi -chown root:admin /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/log/development.log -chmod 0660 /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/log/development.log -chown root:admin /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/js/navigation.js -chmod 0660 /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/js/navigation.js -#chown root:admin /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/AdminLTE/public/js/navigation.js -#chmod 0660 /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/AdminLTE/public/js/navigation.js -chown root:admin /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_navig.html.ep -chmod 0660 /etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_navig.html.ep -chown root:admin /etc/e-smith/web/functions2/wrapper2 -chmod 4750 /etc/e-smith/web/functions2/wrapper2 +# js-jquery from epel +##if (rpm -q js-jquery > /dev/null 2>&1) +if [ -f /usr/share/javascript/jquery/latest/jquery.min.js ] +then + mkdir %{dir_mngr}/cgi-bin/srvmngr/themes/default/public/js + ln -s /usr/share/javascript/jquery/latest/jquery.min.js %{dir_mngr}/cgi-bin/srvmngr/themes/default/public/js/jquery.min.js +fi %postun