diff -urN smeserver-manager-0.1.2.old/createlinks smeserver-manager-0.1.2/createlinks --- smeserver-manager-0.1.2.old/createlinks 2021-01-07 20:39:03.000000000 +0400 +++ smeserver-manager-0.1.2/createlinks 2021-01-07 21:59:59.997000000 +0400 @@ -27,7 +27,7 @@ { safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/smanager"); - safe_symlink("sigusr1", + safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); } diff -urN smeserver-manager-0.1.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27SManagerProxyPass smeserver-manager-0.1.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27SManagerProxyPass --- smeserver-manager-0.1.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27SManagerProxyPass 2020-11-19 11:53:26.000000000 +0400 +++ smeserver-manager-0.1.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27SManagerProxyPass 2021-01-06 20:41:38.000000000 +0400 @@ -16,11 +16,9 @@ $OUT .= ' RewriteCond %{REMOTE_ADDR} !^127\.0\.0\.1$' . "\n"; $OUT .= " RewriteRule ^/$place(/.*|\$) https://%{HTTP_HOST}/$place\$1 [L,R]\n"; $OUT .= "\n"; - $OUT .= '# RewriteCond %{REQUEST_FILENAME} !-f' . "\n"; - $OUT .= " RewriteCond %{REQUEST_URI} (.*)/$place\$ \n"; - $OUT .= ' RewriteRule ^(.*)$ $1/ [L,R=301]' . "\n"; - $OUT .= "# RewriteRule . %{REQUEST_URI}/ [L,R=301]\n"; - } + } + $OUT .= " RewriteRule ^/$place\$ https://%{HTTP_HOST}/$place/ [L,R]\n\n"; + $OUT .= " ProxyRequests Off\n"; $OUT .= " ProxyPreserveHost On\n"; $OUT .= " ProxyPass /$place http://127.0.0.1:$adminPort2 keepalive=On\n"; diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/lib/SrvMngr/Controller/Remoteaccess.pm smeserver-manager-0.1.2/root/usr/share/smanager/lib/SrvMngr/Controller/Remoteaccess.pm --- smeserver-manager-0.1.2.old/root/usr/share/smanager/lib/SrvMngr/Controller/Remoteaccess.pm 2020-11-19 11:53:26.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/lib/SrvMngr/Controller/Remoteaccess.pm 2021-01-07 22:24:30.929000000 +0400 @@ -27,11 +27,12 @@ #our @ISA = qw(esmith::FormMagick Exporter); our @EXPORT = qw( networkAccess_list passwordLogin_list get_ssh_permit_root_login get_ssh_access get_telnet_mode - get_ftp_access get_pptp_sessions get_ftp_password_login_access + get_ftp_access get_ftp_password_login_access get_value get_prop get_ssh_password_auth validate_network_and_mask ip_number_or_blank subnet_mask_or_blank get_ipsecrw_sessions pptp_and_dhcp_range ); +# get_pptp_sessions our $db = esmith::ConfigDB->open || warn "Couldn't open configuration database"; @@ -46,7 +47,7 @@ my %rma_datas = (); #$rma_datas{ipsecrwSess} = $c->get_ipsecrw_sessions(); - $rma_datas{pptpSessions} = $c->get_pptp_sessions(); + #$rma_datas{pptpSessions} = $c->get_pptp_sessions(); $rma_datas{sshAccess} = $c->get_ssh_access(); $rma_datas{sshPermitRootLogin} = $c->get_ssh_permit_root_login(); $rma_datas{sshPasswordAuthentication} = $c->get_ssh_password_auth(); @@ -73,7 +74,7 @@ $rma_datas{ipsecrwSess} = ($c->param ('IpsecrwSess') || ''); $rma_datas{ipsecrwReset} = ($c->param ('IpsecrwReset') || ''); - $rma_datas{pptpSessions} = ($c->param ('PptpSessions') || '0'); + #$rma_datas{pptpSessions} = ($c->param ('PptpSessions') || '0'); $rma_datas{validFromNetwork} = ($c->param ('ValidFromNetwork') || ''); $rma_datas{validFromMask} = ($c->param ('ValidFromMask') || ''); @@ -95,7 +96,7 @@ my $v = $c->validation; return $c->render('remoteaccess') unless $v->has_data; - $v->optional('PptpSessions')->num(0, 999)->is_valid; + #$v->optional('PptpSessions')->num(0, 999)->is_valid; $v->optional('ValidFromNetwork')->size(7, 15)->is_valid; $v->optional('ValidFromMask')->size(7, 15)->is_valid; $v->required('SshTCPPort')->num(1, 65535)->is_valid; @@ -105,8 +106,8 @@ if ( ! $result ) { # controls - $res = pptp_and_dhcp_range( $c, $rma_datas{pptpSessions} ); - $result .= $res . ' ' unless $res eq 'OK'; + #$res = pptp_and_dhcp_range( $c, $rma_datas{pptpSessions} ); + #$result .= $res . ' ' unless $res eq 'OK'; $res = ip_number_or_blank( $c, $rma_datas{validFromNetwork} ); $result .= $res . ' ' unless $res eq 'OK'; @@ -184,16 +185,12 @@ } -sub get_pptp_sessions { - - my $status = get_prop('','pptpd','status'); - if (defined($status) && ($status eq 'enabled')) { - return(get_prop('','pptpd','sessions') || 'no'); - } - else { - return('0'); - } -} +#sub get_pptp_sessions { +# my $status = get_prop('','pptpd','status'); +# if (defined($status) && ($status eq 'enabled')) { +# return(get_prop('','pptpd','sessions') || 'no'); +# return '0'; +#} sub get_ssh_permit_root_login { @@ -381,12 +378,12 @@ } } - if ($rma_datas{pptpSessions} == 0) { - $db->get('pptpd')->set_prop('status', 'disabled'); - } else { - $db->get('pptpd')->set_prop('status', 'enabled'); - $db->get('pptpd')->set_prop('sessions', $rma_datas{pptpSessions}); - } +# if ($rma_datas{pptpSessions} == 0) { +# $db->get('pptpd')->set_prop('status', 'disabled'); +# } else { +# $db->get('pptpd')->set_prop('status', 'enabled'); +# $db->get('pptpd')->set_prop('sessions', $rma_datas{pptpSessions}); +# } if ( $rma_datas{validFromNetwork} && $rma_datas{validFromMask} ) { unless (add_new_valid_from( $c, $rma_datas{validFromNetwork}, $rma_datas{validFromMask} )) { 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 --- smeserver-manager-0.1.2.old/root/usr/share/smanager/lib/SrvMngr.pm 2021-01-07 20:39:03.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/lib/SrvMngr.pm 2021-01-07 21:48:13.716000000 +0400 @@ -23,7 +23,7 @@ use SrvMngr::Model::Main; -our $VERSION = '1.203'; +our $VERSION = '1.204'; $VERSION = eval $VERSION; use Exporter 'import'; @@ -243,8 +243,8 @@ $if_admin->get('/ibays')->to('ibays#main')->name('ibays'); $if_admin->post('/ibays')->to('ibays#do_display')->name('ibayadd'); - $if_admin->get('/ibayd')->to('ibays#do_display')->name('ibaydis'); - $if_admin->post('/ibayd')->to('ibays#do_update')->name('ibayupd'); + $if_admin->get('/ibaysd')->to('ibays#do_display')->name('ibaydis'); + $if_admin->post('/ibaysd')->to('ibays#do_update')->name('ibayupd'); $if_admin->get('/localnetworks')->to('localnetworks#main')->name('localnetworks'); @@ -276,8 +276,8 @@ $if_admin->post('/qmailanalog')->to('qmailanalog#do_update')->name('qmailanalog2'); $if_admin->get('/quota')->to('quota#main')->name('quota'); - $if_admin->get('/quotaupd')->to('quota#do_display')->name('quotalist'); - $if_admin->post('/quotaupd')->to('quota#do_update')->name('quotaupd'); + $if_admin->get('/quotad')->to('quota#do_display')->name('quotalist'); + $if_admin->post('/quotad')->to('quota#do_update')->name('quotaupd'); $if_admin->post('/quota2')->to('quota#do_update')->name('quotaval'); $if_admin->get('/reboot')->to('reboot#main')->name('reboot'); diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_iba_del.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_iba_del.html.ep --- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_iba_del.html.ep 2020-11-19 11:53:26.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_iba_del.html.ep 2021-01-06 20:47:18.000000000 +0400 @@ -1,7 +1,7 @@
% my $btn = l('REMOVE'); - %= form_for '/ibayd' => (method => 'POST') => begin + %= form_for '/ibaysd' => (method => 'POST') => begin

%=l 'iba_REMOVE_TITLE' diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep --- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep 2020-11-19 11:53:26.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep 2021-01-06 20:48:38.000000000 +0400 @@ -47,18 +47,18 @@ %= t td => (class => 'sme-border') => $ibay->prop('Name') % my ($actionModify, $actionResetPw, $actionRemove) = ' '; % if ($modifiable eq 'yes') { - % $actionModify = "" . l('MODIFY') . ""; + % $actionModify = "" . l('MODIFY') . ""; % } % if ($passwordable eq 'yes') { % if ($ibay->prop('PasswordSet') ne 'yes' && $needPassword) { - % $actionResetPw .= "" . l('PASSWORD_RESET') . ""; + % $actionResetPw .= "" . l('PASSWORD_RESET') . ""; % } else { - % $actionResetPw .= "" . l('PASSWORD_RESET') . ""; + % $actionResetPw .= "" . l('PASSWORD_RESET') . ""; % } % $actionResetPw .= ' '; % } % if ($removable eq 'yes') { - % $actionRemove = "" . l('REMOVE') . ""; + % $actionRemove = "" . l('REMOVE') . ""; % } <%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionResetPw) %> diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_iba_pwd.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_iba_pwd.html.ep --- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_iba_pwd.html.ep 2020-11-19 11:53:26.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_iba_pwd.html.ep 2021-01-06 20:49:04.000000000 +0400 @@ -2,7 +2,7 @@ % my $btn = l('SAVE'); - %= form_for '/ibayd' => (method => 'POST') => begin + %= form_for '/ibaysd' => (method => 'POST') => begin

%=l 'PASSWORD_RESET' diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_iba_upd.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_iba_upd.html.ep --- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_iba_upd.html.ep 2020-11-19 11:53:26.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_iba_upd.html.ep 2021-01-06 20:49:31.000000000 +0400 @@ -3,7 +3,7 @@ % my $btn = l('ADD'); - %= form_for '/ibayd' => (method => 'POST') => begin + %= form_for '/ibaysd' => (method => 'POST') => begin

%=l 'iba_ADD_TITLE' diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_quo_list.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_quo_list.html.ep --- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_quo_list.html.ep 2020-11-19 11:53:26.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_quo_list.html.ep 2021-01-06 20:50:19.000000000 +0400 @@ -56,7 +56,7 @@ %= t td => (class => 'sme-border') => sprintf("%.2f", $bs / 1024 ) %= t td => (class => 'sme-border') => sprintf("%.2f", $bh / 1024 ) %= t td => (class => 'sme-border') => sprintf("%.2f", $bc / 1024 ) - <%=l 'MODIFY'%> + <%=l 'MODIFY'%> % } diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_rma_pptp.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_rma_pptp.html.ep --- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_rma_pptp.html.ep 1970-01-01 04:00:00.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_rma_pptp.html.ep 2021-01-06 20:58:05.000000000 +0400 @@ -0,0 +1,14 @@ +

+ %=l 'rma_TITLE_PPTP' +


+ %=l 'rma_DESC_PPTP' +
+ + %=l 'rma_LABEL_PPTP' + + % param 'PptpSessions' => $c->get_pptp_sessions unless param 'PptpSessions'; + %= text_field 'PptpSessions' => $c->get_pptp_sessions(), class => 'input' + +

+ +
diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep --- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep 2020-11-19 11:53:26.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/remoteaccess.html.ep 2021-01-06 21:01:51.000000000 +0400 @@ -55,20 +55,7 @@

%} -

- %=l 'rma_TITLE_PPTP' -


- %=l 'rma_DESC_PPTP' -
- - %=l 'rma_LABEL_PPTP' - - % param 'PptpSessions' => $c->get_pptp_sessions unless param 'PptpSessions'; - %= text_field 'PptpSessions' => $c->get_pptp_sessions(), class => 'input' - -

- -
+

%= $c->l('rma_VALIDFROM_TITLE', $c->l('rma_REMOTE_MANAGEMENT'));