diff -Nur e-smith-base-5.8.0.old/CVS/Entries e-smith-base-5.8.0/CVS/Entries
--- e-smith-base-5.8.0.old/CVS/Entries	1969-12-31 19:00:00.000000000 -0500
+++ e-smith-base-5.8.0/CVS/Entries	2021-01-08 17:12:35.619000000 -0500
@@ -0,0 +1 @@
+D
diff -Nur e-smith-base-5.8.0.old/CVS/Repository e-smith-base-5.8.0/CVS/Repository
--- e-smith-base-5.8.0.old/CVS/Repository	1969-12-31 19:00:00.000000000 -0500
+++ e-smith-base-5.8.0/CVS/Repository	2021-01-08 17:12:35.618000000 -0500
@@ -0,0 +1 @@
+rpms/e-smith-base/sme10/e-smith-base-5.8.0
diff -Nur e-smith-base-5.8.0.old/CVS/Root e-smith-base-5.8.0/CVS/Root
--- e-smith-base-5.8.0.old/CVS/Root	1969-12-31 19:00:00.000000000 -0500
+++ e-smith-base-5.8.0/CVS/Root	2021-01-08 17:12:35.618000000 -0500
@@ -0,0 +1 @@
+:ext:jpp@shell.koozali.org:/cvs/smeserver
diff -Nur e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/systemd-isolate e-smith-base-5.8.0/root/etc/e-smith/events/actions/systemd-isolate
--- e-smith-base-5.8.0.old/root/etc/e-smith/events/actions/systemd-isolate	2021-01-08 16:26:50.594000000 -0500
+++ e-smith-base-5.8.0/root/etc/e-smith/events/actions/systemd-isolate	2021-01-08 16:27:46.427000000 -0500
@@ -1,3 +1,3 @@
 #!/usr/bin/bash
-/usr/bin/systemctl isolate sme-server.target
+/usr/bin/systemctl -q sme-server.target || /usr/bin/systemctl isolate sme-server.target
 /usr/bin/systemctl daemon-reload
diff -Nur e-smith-base-5.8.0.old/root/usr/lib/systemd/system-preset/50-koozali.preset e-smith-base-5.8.0/root/usr/lib/systemd/system-preset/50-koozali.preset
--- e-smith-base-5.8.0.old/root/usr/lib/systemd/system-preset/50-koozali.preset	2021-01-08 16:26:50.677000000 -0500
+++ e-smith-base-5.8.0/root/usr/lib/systemd/system-preset/50-koozali.preset	2021-01-08 17:05:54.298000000 -0500
@@ -22,6 +22,7 @@
 enable php72-php-fpm.service
 enable php73-php-fpm.service
 enable php74-php-fpm.service
+enable php80-php-fpm.service
 enable httpd-e-smith.service
 enable httpd-admin.service
 enable crond.service
@@ -37,9 +38,9 @@
 enable local.service
 enable yum.service
 disable rc-local.service
+enable mariadb.service
+enable cvm-unix-local.service
 
-#need to change after integration
-#enable mariadb.service
 
 # need change after deciding service name
 # enable mdmonitor.service
@@ -56,10 +57,9 @@
 enable rsyslog.service
 enable smartd.service
 
-#need to change after integration
-#enable smb.service
-#enable nmdb.service
-#enable smbd.service
+enable smb.service
+enable nmdb.service
+enable smbd.service
 
 disable smtp-auth-proxy.service
 disable spamd.service
@@ -70,4 +70,6 @@
 disable nut-server.service
 disable nut-monitor.service
 disable ntpdate.service
+disable ftp.service
+disable proftpd.service