mirror of
https://github.com/mail-in-a-box/mailinabox.git
synced 2025-04-18 02:32:09 +00:00
remove docker stuffs
This commit is contained in:
parent
842b02fd6d
commit
fac1b32827
@ -24,14 +24,6 @@ if [ -z "${NONINTERACTIVE:-}" ]; then
|
|||||||
\n\nNOTE: You should only install this on a brand new Ubuntu installation 100% dedicated to Mail-in-a-Box. Mail-in-a-Box will, for example, remove apache2."
|
\n\nNOTE: You should only install this on a brand new Ubuntu installation 100% dedicated to Mail-in-a-Box. Mail-in-a-Box will, for example, remove apache2."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "${INSTALL:-}" ]; then
|
|
||||||
INSTALL=m
|
|
||||||
input_box "Where is Mail-in-a-Box installed?" \
|
|
||||||
"Are you installing Mail-in-a-Box on bare [m]etal or within [d]ocker? \
|
|
||||||
\n\n[m]etal or [d]ocker?" \
|
|
||||||
m \
|
|
||||||
INSTALL
|
|
||||||
fi
|
|
||||||
|
|
||||||
# The box needs a name.
|
# The box needs a name.
|
||||||
if [ -z "${PRIMARY_HOSTNAME:-}" ]; then
|
if [ -z "${PRIMARY_HOSTNAME:-}" ]; then
|
||||||
|
@ -12,9 +12,7 @@ source setup/functions.sh # load our functions
|
|||||||
# First set the hostname in the configuration file, then activate the setting
|
# First set the hostname in the configuration file, then activate the setting
|
||||||
|
|
||||||
echo $PRIMARY_HOSTNAME > /etc/hostname
|
echo $PRIMARY_HOSTNAME > /etc/hostname
|
||||||
if [ "$INSTALL" == "m" ]; then
|
hostname $PRIMARY_HOSTNAME
|
||||||
hostname $PRIMARY_HOSTNAME
|
|
||||||
fi
|
|
||||||
|
|
||||||
# ### Fix permissions
|
# ### Fix permissions
|
||||||
|
|
||||||
@ -84,7 +82,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 if we're installing on bare metal
|
# ### Add PPAs
|
||||||
|
|
||||||
# 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.
|
||||||
@ -94,17 +92,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
|
|
||||||
|
|
||||||
# Install the certbot PPA.
|
# Ensure the universe repository is enabled since some of our packages
|
||||||
hide_output add-apt-repository -y ppa:certbot/certbot # Remarking repository to help docker install
|
# come from there and minimal Ubuntu installs may have it turned off.
|
||||||
|
hide_output add-apt-repository -y universe
|
||||||
|
|
||||||
|
# Install the certbot PPA.
|
||||||
|
hide_output add-apt-repository -y ppa:certbot/certbot # Remarking repository to help docker install
|
||||||
|
|
||||||
|
# Install the duplicity PPA.
|
||||||
|
hide_output add-apt-repository -y ppa:duplicity-team/duplicity-release-git
|
||||||
|
|
||||||
# Install the duplicity PPA.
|
|
||||||
hide_output add-apt-repository -y ppa:duplicity-team/duplicity-release-git
|
|
||||||
fi
|
|
||||||
|
|
||||||
# ### Update Packages
|
# ### Update Packages
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user