diff -urN smeserver-manager-0.1.2.old/createlinks smeserver-manager-0.1.2/createlinks --- smeserver-manager-0.1.2.old/createlinks 2021-03-10 12:14:43.000000000 +0400 +++ smeserver-manager-0.1.2/createlinks 2021-04-12 19:05:59.732000000 +0400 @@ -42,4 +42,5 @@ event_link('locales2-conf', "$event", '80'); } -event_link('systemd-reload', "smeserver-manager-update", '85'); +event_link('systemd-default', "smeserver-manager-update", '88'); +event_link('systemd-reload', "smeserver-manager-update", '89'); 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 --- smeserver-manager-0.1.2.old/root/etc/e-smith/db/configuration/defaults/smanager/status 2020-11-19 11:53:26.000000000 +0400 +++ smeserver-manager-0.1.2/root/etc/e-smith/db/configuration/defaults/smanager/status 2021-04-12 20:11:57.975000000 +0400 @@ -1,2 +1 @@ enabled - 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 --- smeserver-manager-0.1.2.old/root/etc/e-smith/db/configuration/migrate/smanager 2020-11-19 11:53:26.000000000 +0400 +++ smeserver-manager-0.1.2/root/etc/e-smith/db/configuration/migrate/smanager 2021-04-11 21:34:04.028000000 +0400 @@ -22,7 +22,7 @@ } my $rec = $DB->get('smanager') - || $DB->new_record('smanager', {type => 'configuration'}); + || $DB->new_record('smanager', {type => 'service'}); my $pwd = $rec->prop('Secrets'); if (not $pwd or length($pwd) < 57){ 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 --- smeserver-manager-0.1.2.old/root/usr/lib/systemd/system/smanager.service 2021-03-10 12:14:43.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/lib/systemd/system/smanager.service 2021-04-12 20:00:21.112000000 +0400 @@ -1,15 +1,14 @@ [Unit] Description=Server Manager 2 Mojo -Requires=network.target -# httpd.service slapd.service +Requires=network.target httpd-e-smith.service slapd.service After=network.target -# slapd.service [Service] Type=simple SyslogIdentifier=smanager WorkingDirectory=/usr/share/smanager/script PIDFile=/var/run/smanager.pid +ExecStartPre=/sbin/e-smith/service-status smanager ExecStart=/usr/bin/hypnotoad srvmngr -f ExecStop=/usr/bin/hypnotoad -s srvmngr ExecReload=/usr/bin/hypnotoad srvmngr 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 --- smeserver-manager-0.1.2.old/root/usr/lib/systemd/system-preset/80-koozali-smanager.preset 2021-03-10 12:14:43.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/lib/systemd/system-preset/80-koozali-smanager.preset 1970-01-01 04:00:00.000000000 +0400 @@ -1,2 +0,0 @@ -enable smanager.service - 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 --- smeserver-manager-0.1.2.old/root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm 2021-03-10 12:14:43.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm 2021-03-17 11:40:11.000000000 +0400 @@ -23,7 +23,8 @@ # Get some basic info on the current SME install our $sysconfig = $cdb->get('sysconfig'); -our $systemmode = $sysconfig->prop('PreviousSystemMode'); +our $systemmode = $cdb->get('SystemMode')->value; +our $previoussystemmode = $sysconfig->prop('PreviousSystemMode'); our $releaseversion = $sysconfig->prop('ReleaseVersion'); # Prepare some filehandles for templates and reports @@ -122,6 +123,7 @@ releaseversion => \$releaseversion, curkernel => \$curkernel, systemmode => \$systemmode, + previoussystemmode => \$previoussystemmode, newrpms => \@newrpms, templates => \@templates, events => \@events, 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 --- 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 +++ 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 @@ -7,6 +7,7 @@ 'bugr_REPORT_CONTENT' => 'The report will contain the following information', 'bugr_SME_VERSION' => 'Koozali SME Server version', 'bugr_SERVER_MODE' => 'Server mode', +'bugr_PREVIOUS_SERVER_MODE' => 'Previous server mode', 'bugr_KERNEL_AND_ARCH' => 'Current running kernel version and architecture', 'bugr_INSTALLED_RPMS' => 'A list of additional RPMs installed on your server', 'bugr_ALTERED_TEMPLATES' => 'A list of SME templates that have been altered on your server from a base install', 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 --- 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 +++ 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 @@ -7,6 +7,7 @@ 'bugr_REPORT_CONTENT' => 'Le rapport contiendra les informations suivantes ', 'bugr_SME_VERSION' => 'Version du Serveur Koozali SME', 'bugr_SERVER_MODE' => 'Mode d’installation du serveur', +'bugr_PREVIOUS_SERVER_MODE' => 'Mode d’installation précédent du serveur', 'bugr_KERNEL_AND_ARCH' => 'Version chargée du kernel et architecture', 'bugr_INSTALLED_RPMS' => 'Une liste des RPMs additionnels installés sur votre serveur', 'bugr_ALTERED_TEMPLATES' => 'Une liste des gabarits SME qui ont été altérés sur votre serveur par rapport à une installation de base', 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-03-10 12:14:44.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/lib/SrvMngr.pm 2021-04-12 20:23:03.608000000 +0400 @@ -23,7 +23,7 @@ use SrvMngr::Model::Main; -our $VERSION = '1.206'; +our $VERSION = '1.207'; $VERSION = eval $VERSION; use Exporter 'import'; 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 --- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/bugreport.html.ep 2020-11-19 11:53:26.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/bugreport.html.ep 2021-03-17 11:32:06.000000000 +0400 @@ -33,6 +33,8 @@
  • %=l ('bugr_SERVER_MODE')
  • + %=l ('bugr_PREVIOUS_SERVER_MODE') +
  • %=l ('bugr_KERNEL_AND_ARCH')
  • %=l ('bugr_INSTALLED_RPMS') 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 --- 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 +++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep 2021-03-17 12:25:45.651000000 +0400 @@ -27,8 +27,6 @@ % } - %= include 'partials/_info' -
    %= content 'js_toggleMenu' @@ -43,6 +41,9 @@ % }
    + + %= include 'partials/_info' + % if (flash 'success') {
    %= $c->render_to_string(inline => flash 'success') 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 --- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/manual.html.ep 2020-11-19 11:53:26.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/manual.html.ep 2021-03-14 21:53:05.000000000 +0400 @@ -1,9 +1,9 @@ % layout 'default', title => 'Sme server 2 - Manual'; % content_for 'module' => begin -
    -

    <%= $title %>

    - <%= $modul %>
    +
    +

    <%= $title %>

    + %= $c->render_to_string( inline => stash 'modul' )
    % end 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 --- 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 +++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_header.html.ep 2021-03-17 12:33:07.276000000 +0400 @@ -1,7 +1,7 @@