diff -urN smeserver-manager-0.1.0.old/createlinks smeserver-manager-0.1.0/createlinks --- smeserver-manager-0.1.0.old/createlinks 2020-06-14 20:32:54.490778984 +0400 +++ smeserver-manager-0.1.0/createlinks 2020-06-14 20:22:02.000000000 +0400 @@ -7,8 +7,6 @@ #-------------------------------------------------- my $mngrdir = '/usr/share/smanager'; -# links to add - # templates to expand for ( qw( sme_core.css sme_main.css sme_menu.css styles.css ) ) { @@ -18,14 +16,19 @@ } templates2events("$mngrdir/conf/srvmngr.conf", - qw( smanager-modify bootstrap-console-save console-save)); + qw( smanager-modify bootstrap-console-save console-save )); templates2events("/etc/systemd/system/smanager.service", - qw( smanager-modify bootstrap-console-save console-save)); + qw( smanager-modify bootstrap-console-save console-save )); # services to launch on event +for my $event ( qw( smanager-modify smanager-refresh bootstrap-console-save console-save ) ) +{ + safe_symlink("restart", + "root/etc/e-smith/events/$event/services2adjust/smanager"); +} # actions to perform -for my $event (qw( yum-install yum-update yum-remove smanager-refresh bootstrap-console-save console-save)) +for my $event ( qw( yum-install yum-update yum-remove smanager-refresh bootstrap-console-save console-save ) ) { event_link('navigation2-conf', "$event", '80'); event_link('routes2-conf', "$event", '80'); diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27SManagerProxyPass smeserver-manager-0.1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27SManagerProxyPass --- smeserver-manager-0.1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27SManagerProxyPass 2020-05-20 16:50:11.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27SManagerProxyPass 2020-06-25 18:21:34.550012316 +0400 @@ -4,13 +4,11 @@ $haveSSL = (exists ${modSSL}{status} and ${modSSL}{status} eq "enabled") ? 'yes' : 'no'; $plainTextAccess = ${'httpd-admin'}{PermitPlainTextAccess} || 'no'; $plainPort = ${'httpd-e-smith'}{TCPPort} || '80'; - $adminPort2 = ${'httpd-admin'}{TCPPort2} || '982'; + $adminPort2 = ${'smanager'}{TCPPort} || '982'; $sslPort = ${modSSL}{TCPPort} || '443'; $OUT = ''; - $OUT .= "# LogLevel alert rewrite:trace8 \n"; - foreach $place ('smanager') { if (($port eq $plainPort) && ($haveSSL eq 'yes') && ($plainTextAccess ne 'yes')) diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/templates/etc/systemd/system/smanager.service/10All smeserver-manager-0.1.0/root/etc/e-smith/templates/etc/systemd/system/smanager.service/10All --- smeserver-manager-0.1.0.old/root/etc/e-smith/templates/etc/systemd/system/smanager.service/10All 2020-05-28 23:45:55.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/templates/etc/systemd/system/smanager.service/10All 2020-06-30 21:41:30.756998402 +0400 @@ -1,13 +1,11 @@ [Unit] Description=Server Manager 2 Mojo Requires=network.target -After=network.target -#Requires=apache.target -#After=ldap.target +##Requires= httpd.target slapd.target +##After=network.target slapd.target [Service] Type=simple -# Type=forking SyslogIdentifier=smanager WorkingDirectory=/usr/share/smanager/script PIDFile=/var/run/smanager.pid diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/conf/srvmngr.conf/25hypnotoad smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/conf/srvmngr.conf/25hypnotoad --- smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/conf/srvmngr.conf/25hypnotoad 2020-06-06 13:51:10.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/conf/srvmngr.conf/25hypnotoad 2020-06-25 18:05:01.529568344 +0400 @@ -1,6 +1,6 @@ hypnotoad => \{ ## adresses and ports listened - listen => ['http://127.0.0.1:{$smanager{'Port'} || 982 }'], + listen => ['http://127.0.0.1:{$smanager{'TCPPort'} || 982 }'], proxy => 1, pid_file => '/var/run/smanager.pid', diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/styles.css/50body smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/styles.css/50body --- smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/styles.css/50body 2020-06-12 22:40:03.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/styles.css/50body 2020-06-30 19:51:14.759304053 +0400 @@ -1,7 +1,7 @@ { $OUT = <<'EOF'; -/* smanager (smeserver_manager2) */ +/* smeserver_manager2 */ /*---------------------------------------------------------------------- * copyright (C) 1999-2003 Mitel Networks Corporation @@ -147,24 +147,26 @@ font-weight: bold; } +.section { +} .a, .item { line-height: 12px; } .section-title { display: inline-block; - line-height: 19px; - color: #888; + color: #6CA345; /*#888;*/ padding-left: 5px; padding-right: 5px; + line-height: 18px; font-weight: bold; } -p.menu-title { +.menu-title { display: inline-block; - color: #666; - padding-left: 0px; - padding-right: 0px; + color: #1A6D1A; /*#666;*/ + padding-left: 1px; + padding-right: 1px; font-weight: bold; } @@ -209,7 +211,6 @@ text-align: center; } - /*end*/ EOF diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm 2020-05-30 20:46:54.000000000 +0400 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm 2020-07-01 18:03:45.268785684 +0400 @@ -19,7 +19,7 @@ use esmith::FormMagick; #use esmith::FormMagick::Panel::datetime; -our $db = esmith::ConfigDB->open() || die "Couldn't open config db"; +our $cdb = esmith::ConfigDB->open() || die "Couldn't open config db"; sub main { my $c = shift; @@ -30,12 +30,12 @@ my $modul = $c->l('dat_INITIAL_DESC'); # more complicated for ntpstatus - $dat_datas{'ntpstatus'} = ($db->get_prop('ntpd','status')) || ''; - $dat_datas{'ntpserver'} = ($db->get_prop('ntpd','NTPServer')) || ''; + $dat_datas{'ntpstatus'} = ($cdb->get_prop('ntpd','status')) || ''; + $dat_datas{'ntpserver'} = ($cdb->get_prop('ntpd','NTPServer')) || ''; $dat_datas{'now_string'} = esmith::FormMagick->gen_locale_date_string(); $c->stash( title => $title, modul => $modul, dat_datas => \%dat_datas ); - $c->render(template => 'datetime'); + $c->render('datetime'); }; @@ -45,22 +45,22 @@ my %dat_datas = (); my $title = $c->l('dat_FORM_TITLE'); - my $result = ""; + my $result = ''; my $old_ntpstatus = $c->param('old_ntpstatus'); - $dat_datas{'ntpstatus'} = $c->param('ntpstatus'); - if ($dat_datas{'ntpstatus'} ne $old_ntpstatus) { - my $modul = $c->l('dat_INITIAL_DESC'); - $dat_datas{'ntpserver'} = ($db->get_prop('ntpd','NTPServer')) || ''; - $dat_datas{'now_string'} = esmith::FormMagick->gen_locale_date_string(); + $dat_datas{ntpstatus} = $c->param('ntpstatus'); + if ($dat_datas{ntpstatus} ne $old_ntpstatus) { + my $modul = $c->l('dat_INITIAL_DESC'); + $dat_datas{ntpserver} = ($cdb->get_prop('ntpd','NTPServer')) || ''; + $dat_datas{now_string} = esmith::FormMagick->gen_locale_date_string(); $c->stash( title => $title, modul => $modul, dat_datas => \%dat_datas ); - $c->render(template => 'datetime'); + return $c->render('datetime'); } - if ($dat_datas{'ntpstatus'} eq 'enabled') { - $dat_datas{'ntpserver'} = $c->param('ntpserver'); - $db->get('ntpd')->set_prop('NTPServer', $dat_datas{'ntpserver'}); + if ($dat_datas{ntpstatus} eq 'enabled') { + $dat_datas{ntpserver} = $c->param('ntpserver'); + $cdb->get('ntpd')->set_prop('NTPServer', $dat_datas{'ntpserver'}); } else { #my $servername = ($c->param('ServerName') || 'WS'); } @@ -69,15 +69,23 @@ # # Update the system # - system ("/sbin/e-smith/signal-event datetime-update") == 0 - or $result = $c->l('ERROR_UPDATING'); + system ("/sbin/e-smith/signal-event", "datetime-update") == 0 + or $result = $c->l('ERROR_UPDATING_CONFIGURATION'); + if ( $result ) { + $c->stash( error => $result ); + $c->stash( title => $title, dat_datas => \%dat_datas ); + return $c->render('datetime'); + #$c->flash( error => $result . '- f l a s h' ); + #$c->redirect_to('/datetime'); + } + $result = $c->l('dat_SUCCESS'); - if ( $result eq '' ) { $result = $c->l('dat_SUCCESS'); } - - $c->stash( title => $title, modul => $result ); - $c->render(template => 'module'); + my $message = "'Datetime' update DONE"; + $c->app->log->info($message); + $c->flash( success => $result ); + $c->redirect_to('/datetime'); }; diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Domains.pm smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Domains.pm --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Domains.pm 2020-05-30 20:48:16.000000000 +0400 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Domains.pm 2020-06-28 18:55:52.827074656 +0400 @@ -166,7 +166,7 @@ } if ( ! $result ) { - $result = $c->l('dom_CREATE_SUCCEEDED') . " $domain"; + $result = $c->l('dom_SUCCESSFULLY_CREATED') . " $domain"; } } @@ -189,7 +189,7 @@ } if ( ! $result ) { - $result = $c->l('dom_MODIFY_SUCCEEDED') . " $domain"; + $result = $c->l('dom_SUCCESSFULLY_MODIFIED') . " $domain"; } } @@ -234,7 +234,7 @@ $result .= $res unless $res eq 'OK'; } if ( ! $result ) { - $result = $c->l('dom_REMOVE_SUCCEEDED') . " $domain"; + $result = $c->l('dom_SUCCESSFULLY_DELETED') . " $domain"; } } diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Groups.pm smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Groups.pm --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Groups.pm 2020-05-30 20:47:26.000000000 +0400 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Groups.pm 2020-06-30 23:01:13.000000000 +0400 @@ -279,8 +279,9 @@ my ( $c, $group ) = @_; + my @members = (); my $rec = $adb->get($group); - my @members = split ( /,/, $rec->prop('Members') ); + @members = split ( /,/, $rec->prop('Members') ) if ( $rec ); my %names; foreach my $m (@members) { diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Ibays.pm smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Ibays.pm --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Ibays.pm 2020-06-04 21:12:20.000000000 +0400 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Ibays.pm 2020-06-30 22:04:23.000000000 +0400 @@ -32,7 +32,6 @@ my %iba_datas = (); my $title = $c->l('iba_FORM_TITLE'); - my $modul = ''; $iba_datas{'trt'} = 'LIST'; @@ -42,7 +41,7 @@ @ibays = $adb->ibays(); } - $c->stash( title => $title, modul => $modul, iba_datas => \%iba_datas, ibays => \@ibays ); + $c->stash( title => $title, iba_datas => \%iba_datas, ibays => \@ibays ); $c->render(template => 'ibays'); }; @@ -143,13 +142,14 @@ $iba_datas{'trt'} = $trt; my $result = ''; + my $res; if ( $trt eq 'ADD' ) { my $name = ($c->param('ibay') || ''); # controls - my $res = validate_ibay( $c, $name ); + $res = validate_ibay( $c, $name ); $result .= $res unless $res eq 'OK'; if ( ! $result ) { @@ -167,7 +167,7 @@ my $name = ($c->param('ibay') || ''); # controls - my $res = ''; + $res = ''; if ( ! $result ) { $res = modify_ibay( $c, $name ); @@ -190,11 +190,11 @@ $result .= $c->l('iba_IBAY_PASSWD_VERIFY_ERROR') . ' - '; } - my $res = check_password( $c, $pass1 ); + $res = check_password( $c, $pass1 ); $result .= $res unless $res eq 'OK'; if ( ! $result ) { - my $res = reset_password( $c, $ibay, $pass1 ); + $res = reset_password( $c, $ibay, $pass1 ); $result .= $res unless $res eq 'OK'; if ( ! $result ) { $result = $c->l('iba_SUCCESSFULLY_RESET_PASSWORD') . ' ' . $ibay; @@ -214,7 +214,7 @@ } if ( ! $result ) { - my $res = remove_ibay( $c, $ibay ); + $res = remove_ibay( $c, $ibay ); $result .= $res unless $res eq 'OK'; if ( ! $result ) { $result = $c->l('iba_SUCCESSFULLY_DELETED_IBAY') . ' ' . $ibay; @@ -223,9 +223,19 @@ } } - $c->stash( title => $title, modul => $result, iba_datas => \%iba_datas ); - $c->render(template => 'module'); + # common parts + + if ($res ne 'OK') { + $c->stash( error => $result ); + $c->stash( title => $title, iba_datas => \%iba_datas ); + return $c->render('ibays'); + } + + my $message = "'Ibays' updates ($trt) DONE"; + $c->app->log->info($message); + $c->flash( success => $result ); + $c->redirect_to('/ibays'); }; diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm 2020-05-30 20:47:10.000000000 +0400 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm 2020-06-28 18:50:36.433935049 +0400 @@ -106,7 +106,7 @@ $result .= $res unless $res eq 'OK'; if ( ! $result ) { - $result = $c->l('quo_SUCCESSFULLY_MODIFY') . ' ' . $acct; + $result = $c->l('quo_SUCCESSFULLY_MODIFIED') . ' ' . $acct; } } diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm 2020-05-30 20:47:43.000000000 +0400 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm 2020-07-01 00:51:07.000000000 +0400 @@ -74,9 +74,9 @@ sub rebootFunction_list { my $c = shift; - return [[ $c->l('SHUTDOWN') => 'shutdown' ], - [ $c->l('rbo_REBOOT') => 'reboot' ], - [ $c->l('RECONFIGURE') => 'reconfigure' ]]; + return [[ $c->l('rbo_REBOOT') => 'reboot' ], + [ $c->l('RECONFIGURE') => 'reconfigure' ], + [ $c->l('SHUTDOWN') => 'shutdown' ]]; } diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Manual/manual_fr.lex smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Manual/manual_fr.lex --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Manual/manual_fr.lex 2020-04-18 15:59:25.000000000 +0400 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Manual/manual_fr.lex 2020-07-01 12:01:35.020031190 +0400 @@ -1,4 +1,4 @@ -manual_FORM_TITLE => 'Documentation et manuel en ligne (séparé)', +manual_FORM_TITLE => 'Documentation et manuel en ligne', manual_DESCRIPTION => '