diff -Nur --no-dereference smeserver-centos2sme-6.9.1.old/root/usr/bin/centos2sme smeserver-centos2sme-6.9.1/root/usr/bin/centos2sme --- smeserver-centos2sme-6.9.1.old/root/usr/bin/centos2sme 2021-03-19 22:55:54.307000000 -0400 +++ smeserver-centos2sme-6.9.1/root/usr/bin/centos2sme 2021-03-20 14:56:16.149000000 -0400 @@ -27,14 +27,15 @@ echo "cleaning yum cache" yum --enablerepo=* clean all 1>/dev/null -echo "##########################################################################" -echo "Removing dhcp-common" +#echo "##########################################################################" +#echo "Removing dhcp-common" # from https://forums.contribs.org/index.php/topic,53304.msg276453/topicseen.html#msg276453 # Stefano found deps issues -rpm -e --nodeps dhcp-common +#rpm -e --nodeps dhcp-common echo "##########################################################################" echo "yum upgrade to install last updates, this may take a while, output is hidden unless there is an error, be patient:" +#echo "****log noise is expected about modified RPMDB outside of yum. and missing dhcp-common. That is expected.****" yum upgrade -y 1>/dev/null # they might have come back with upgrade... @@ -79,7 +80,8 @@ echo "##########################################################################" echo "start syslog" -/etc/init.d/rsyslog start +#/etc/init.d/rsyslog start +/usr/bin/systemctl restart rsyslog echo "##########################################################################" echo "running post-install event for SME..." @@ -90,7 +92,8 @@ echo "##########################################################################" echo "set admin password as set" #need syslog to work. so just in case -/etc/init.d/rsyslog restart +#/etc/init.d/rsyslog restart +/usr/bin/systemctl restart rsyslog /sbin/e-smith/db accounts setprop admin PasswordSet yes /sbin/e-smith/db configuration set PasswordSet yes /sbin/e-smith/db configuration setprop bootstrap-console Restore disabled @@ -113,7 +116,8 @@ touch /forcequotacheck #start rsyslogd service in case , as console needs it to run... -/etc/init.d/rsyslog restart +#/etc/init.d/rsyslog restart +/usr/bin/systemctl restart rsyslog.service echo "##########################################################################" echo "now time to configure your server using the SME Server console" @@ -124,6 +128,11 @@ echo "##########################################################################" echo "set SSHD to accept root login with rsa key" /sbin/e-smith/db configuration setprop sshd status enabled PermitRootLogin yes access public +/sbin/e-smith/expand-template /etc/e-smith/events/remoteaccess-update/templates2expand/etc/ssh/ssh_config +/sbin/e-smith/expand-template /etc/e-smith/events/remoteaccess-update/templates2expand/etc/ssh/sshd_config +/usr/bin/systemctl restart sshd.service +# a sshd reload does not regenerate the keys and failed +# doing one after to do the rest (masq etc.) /sbin/e-smith/signal-event remoteaccess-update echo "##########################################################################" @@ -138,8 +147,12 @@ fi +echo "##########################################################################" +echo "Last cleaning:" # last tidying find /var/service/ -type f -iname control -exec rm {} \; +yum remove NetworkManager-libnm libteam teamd python-configobj parted python-decorator python-linux-procf python-perf python-pyude python-schedutils python-slip python-slip-dbu mozjs17 microcode_ctl -y + # just in case before reboot /sbin/e-smith/db configuration set PasswordSet yes