More ubuntu fixes
This commit is contained in:
@ -97,7 +97,16 @@ function global-installPackages() {
|
|||||||
|
|
||||||
#Remove stuff we don't want
|
#Remove stuff we don't want
|
||||||
|
|
||||||
|
export UBUNTU_CHECK
|
||||||
|
UBUNTU_CHECK="$(distro | grep -c Ubuntu || true)"
|
||||||
|
|
||||||
|
if [ "$UBUNTU_CHECK" -eq 1 ]; then
|
||||||
|
apt-get --yes --purge remove chrony telnet inetutils-telnet
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$UBUNTU_CHECK" -eq 0 ]; then
|
||||||
apt-get --yes --purge remove systemd-timesyncd chrony telnet inetutils-telnet
|
apt-get --yes --purge remove systemd-timesyncd chrony telnet inetutils-telnet
|
||||||
|
fi
|
||||||
|
|
||||||
#export DEBIAN_FRONTEND="noninteractive" && apt-get -qq --yes -o Dpkg::Options::="--force-confold" --purge remove nano
|
#export DEBIAN_FRONTEND="noninteractive" && apt-get -qq --yes -o Dpkg::Options::="--force-confold" --purge remove nano
|
||||||
|
|
||||||
@ -248,23 +257,22 @@ function global-postPackageConfiguration() {
|
|||||||
|
|
||||||
systemctl daemon-reload && systemctl restart snmpd && /etc/init.d/snmpd restart
|
systemctl daemon-reload && systemctl restart snmpd && /etc/init.d/snmpd restart
|
||||||
|
|
||||||
cat ./ConfigFiles/NetworkDiscovery/lldpd > /etc/default/lldpd
|
cat ./ConfigFiles/NetworkDiscovery/lldpd >/etc/default/lldpd
|
||||||
systemctl restart lldpd
|
systemctl restart lldpd
|
||||||
|
|
||||||
systemctl stop rsyslog
|
systemctl stop rsyslog
|
||||||
systemctl start rsyslog
|
systemctl start rsyslog
|
||||||
|
|
||||||
|
export NTP_SERVER_CHECK
|
||||||
|
NTP_SERVER_CHECK="$(hostname | egrep -c 'pfv-netboot|pfvsvrpi' || true)"
|
||||||
|
|
||||||
export NTP_SERVER_CHECK
|
if [ "$NTP_SERVER_CHECK" -eq 0 ]; then
|
||||||
NTP_SERVER_CHECK="$(hostname |egrep -c 'pfv-netboot|pfvsvrpi' ||true)"
|
|
||||||
|
|
||||||
if [ "$NTP_SERVER_CHECK" -eq 0 ]; then
|
|
||||||
|
|
||||||
print_info "Not updating NTP config, this is the TSYS Stratum1 NTP server..."
|
print_info "Not updating NTP config, this is the TSYS Stratum1 NTP server..."
|
||||||
cat ./ConfigFiles/NTP/ntp.conf > /etc/ntpsec/ntp.conf
|
cat ./ConfigFiles/NTP/ntp.conf >/etc/ntpsec/ntp.conf
|
||||||
systemctl restart ntpsec.service
|
systemctl restart ntpsec.service
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
systemctl stop postfix
|
systemctl stop postfix
|
||||||
systemctl start postfix
|
systemctl start postfix
|
||||||
|
Reference in New Issue
Block a user