Clean up a2news/tin installation

ipv6 should be enabled on Raspbian nowadays, so we should no longer need
to modify the stock exim configuration.  If it gives you an error on
startup, let me know and we'll put it back.
This commit is contained in:
T. Joseph Carter 2018-04-30 17:42:31 -07:00
parent c0da2b5301
commit 41f829e4dd

View File

@ -133,24 +133,23 @@ install_a2news() {
### CommTools: Install tin + a2news script ### CommTools: Install tin + a2news script
sudo install -o root -g root -m 755 "$a2cSource/setup/a2news" /usr/local/bin/a2news sudo install -o root -g root -m 755 "$a2cSource/setup/a2news" /usr/local/bin/a2news
if ! hash tin 2> /dev/null; then if ! hash tin 2> /dev/null; then
echo "A2CLOUD: Installing a2news/tin..." echo "A2CLOUD: Installing tin..."
sudo apt-get -y install tin sudo apt-get -y install tin
sudo apt-get -y clean sudo apt-get -y clean
else else
echo "A2CLOUD: a2news/tin is already installed." echo "A2CLOUD: tin is already installed."
fi fi
# FIXME: Installing tin pulls in exim4, and it used to have an error at # Leaving this here just in case, but it should not be necessary anymore.
# startup. We should check to see if it still does.
### CommTools: Configure exim4 to use ipv4 to kill console errors # ### CommTools: Configure exim4 to use ipv4 to kill console errors
# have exim4 use IPv4 only to prevent log errors (IPv6 is off by default in Raspbian) # # have exim4 use IPv4 only to prevent log errors (IPv6 is off by default in Raspbian)
if [[ $(grep ' ; ::1' /etc/exim4/update-exim4.conf.conf) ]]; then # if [[ $(grep ' ; ::1' /etc/exim4/update-exim4.conf.conf) ]]; then
echo "A2CLOUD: Setting exim4 to use only IPv4 to prevent startup error messages..." # echo "A2CLOUD: Setting exim4 to use only IPv4 to prevent startup error messages..."
sudo sed -i 's/ ; ::1//' /etc/exim4/update-exim4.conf.conf # sudo sed -i 's/ ; ::1//' /etc/exim4/update-exim4.conf.conf
sudo update-exim4.conf # sudo update-exim4.conf
sudo rm /var/log/exim4/mainlog /var/log/exim4/paniclog &> /dev/null # sudo rm /var/log/exim4/mainlog /var/log/exim4/paniclog &> /dev/null
fi # fi
# restore exim4 log directory if occupied by a file put there by earlier A2CLOUD versions # restore exim4 log directory if occupied by a file put there by earlier A2CLOUD versions
if [[ -f /var/log/exim4 ]]; then if [[ -f /var/log/exim4 ]]; then