external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-18 02:32:09 +00:00
Code Issues Releases Wiki Activity

Update system.sh

Browse Source
This commit is contained in:
kaibae19 2022-04-04 08:02:12 -07:00
parent d8109042ab
commit 030e7137ca
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
setup/system.sh
View File

@ -86,7 +86,7 @@ fi
# (See https://discourse.mailinabox.email/t/journalctl-reclaim-space-on-small-mailinabox/6728/11.) # (See https://discourse.mailinabox.email/t/journalctl-reclaim-space-on-small-mailinabox/6728/11.)
tools/editconf.py /etc/systemd/journald.conf MaxRetentionSec=10day tools/editconf.py /etc/systemd/journald.conf MaxRetentionSec=10day
# ### Add PPAs. Remarking for Docker install test # ### Add PPAs if we're installing on bare metal
# We install some non-standard Ubuntu packages maintained by other # We install some non-standard Ubuntu packages maintained by other
# third-party providers. First ensure add-apt-repository is installed. # third-party providers. First ensure add-apt-repository is installed.
@ -96,16 +96,17 @@ if [ ! -f /usr/bin/add-apt-repository ]; then
hide_output apt-get update hide_output apt-get update
apt_install software-properties-common apt_install software-properties-common
fi fi
if [ "$INSTALL" == "m" ]; then # Skipping adding repositories on Docker image
# Ensure the universe repository is enabled since some of our packages
# come from there and minimal Ubuntu installs may have it turned off.
hide_output add-apt-repository -y universe
# Ensure the universe repository is enabled since some of our packages # Install the certbot PPA.
# come from there and minimal Ubuntu installs may have it turned off. hide_output add-apt-repository -y ppa:certbot/certbot # Remarking repository to help docker install
#hide_output add-apt-repository -y universe
# Install the certbot PPA. # Install the duplicity PPA.
#hide_output add-apt-repository -y ppa:certbot/certbot # Remarking repository to help docker install hide_output add-apt-repository -y ppa:duplicity-team/duplicity-release-git
fi
# Install the duplicity PPA.
#hide_output add-apt-repository -y ppa:duplicity-team/duplicity-release-git
# ### Update Packages # ### Update Packages
@ -262,6 +263,10 @@ EOF
# ### Firewall # ### Firewall
if [ "$INSTALL" == "m" ]; then
DISABLE_FIREWALL=1
fi
# Various virtualized environments like Docker and some VPSs don't provide #NODOC # Various virtualized environments like Docker and some VPSs don't provide #NODOC
# a kernel that supports iptables. To avoid error-like output in these cases, #NODOC # a kernel that supports iptables. To avoid error-like output in these cases, #NODOC
# we skip this if the user sets DISABLE_FIREWALL=1. #NODOC # we skip this if the user sets DISABLE_FIREWALL=1. #NODOC
@ -346,15 +351,17 @@ if ! grep -q "max-recursion-queries " /etc/bind/named.conf.options; then
sed -i "s/^}/\n\tmax-recursion-queries 100;\n}/" /etc/bind/named.conf.options sed -i "s/^}/\n\tmax-recursion-queries 100;\n}/" /etc/bind/named.conf.options
fi fi
# First we'll disable systemd-resolved's management of resolv.conf and its stub server. if [ "$INSTALL" == "m" ]; then
# Breaking the symlink to /run/systemd/resolve/stub-resolv.conf means # First we'll disable systemd-resolved's management of resolv.conf and its stub server.
# systemd-resolved will read it for DNS servers to use. Put in 127.0.0.1, # Breaking the symlink to /run/systemd/resolve/stub-resolv.conf means
# which is where bind9 will be running. Obviously don't do this before # systemd-resolved will read it for DNS servers to use. Put in 127.0.0.1,
# installing bind9 or else apt won't be able to resolve a server to # which is where bind9 will be running. Obviously don't do this before
# download bind9 from. # installing bind9 or else apt won't be able to resolve a server to
rm -f /etc/resolv.conf # download bind9 from.
tools/editconf.py /etc/systemd/resolved.conf DNSStubListener=no rm -f /etc/resolv.conf
echo "nameserver 127.0.0.1" > /etc/resolv.conf tools/editconf.py /etc/systemd/resolved.conf DNSStubListener=no
echo "nameserver 127.0.0.1" > /etc/resolv.conf
fi
# Restart the DNS services. # Restart the DNS services.