rename the scripts directory to setup
This commit is contained in:
parent
af03feb389
commit
da15ae5375
14 changed files with 21 additions and 21 deletions
|
@ -46,12 +46,12 @@ ENV NO_RESTART_SERVICES 1
|
||||||
RUN sed -i -e "s/^#*\s*PasswordAuthentication \(yes\|no\)/PasswordAuthentication no/g" /etc/ssh/sshd_config
|
RUN sed -i -e "s/^#*\s*PasswordAuthentication \(yes\|no\)/PasswordAuthentication no/g" /etc/ssh/sshd_config
|
||||||
|
|
||||||
# Add this repo into the image so we have the configuration scripts.
|
# Add this repo into the image so we have the configuration scripts.
|
||||||
ADD scripts /usr/local/mailinabox/scripts
|
ADD setup /usr/local/mailinabox/setup
|
||||||
ADD conf /usr/local/mailinabox/conf
|
ADD conf /usr/local/mailinabox/conf
|
||||||
ADD tools /usr/local/mailinabox/tools
|
ADD tools /usr/local/mailinabox/tools
|
||||||
|
|
||||||
# Start the configuration.
|
# Start the configuration.
|
||||||
RUN cd /usr/local/mailinabox && scripts/start.sh
|
RUN cd /usr/local/mailinabox && setup/start.sh
|
||||||
|
|
||||||
# Configure services for docker.
|
# Configure services for docker.
|
||||||
ADD containers/docker /usr/local/mailinabox/containers/docker
|
ADD containers/docker /usr/local/mailinabox/containers/docker
|
||||||
|
|
|
@ -30,7 +30,7 @@ Please see the initial and very barebones [Documentation](docs/index.md) for mor
|
||||||
sudo apt-get install -y git
|
sudo apt-get install -y git
|
||||||
git clone https://github.com/joshdata/mailinabox
|
git clone https://github.com/joshdata/mailinabox
|
||||||
cd mailinabox
|
cd mailinabox
|
||||||
sudo scripts/start.sh
|
sudo setup/start.sh
|
||||||
|
|
||||||
**Status**: This is a work in progress. It works for what it is, but it is missing such things as quotas, backup/restore, etc.
|
**Status**: This is a work in progress. It works for what it is, but it is missing such things as quotas, backup/restore, etc.
|
||||||
|
|
||||||
|
|
|
@ -19,6 +19,6 @@ if grep "^PUBLIC_IP=192.168.200.1" /etc/mailinabox.conf > /dev/null; then
|
||||||
# have not been started yet, so we can't ask the user to create an
|
# have not been started yet, so we can't ask the user to create an
|
||||||
# account yet.
|
# account yet.
|
||||||
cd /usr/local/mailinabox
|
cd /usr/local/mailinabox
|
||||||
scripts/start.sh < /dev/null
|
setup/start.sh < /dev/null
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,7 @@ After logging into your *new* server with SSH and becoming root, type the follow
|
||||||
|
|
||||||
Now you've got the Mail-in-a-Box source code stored on your server. The next command starts the automatic configuration of the server:
|
Now you've got the Mail-in-a-Box source code stored on your server. The next command starts the automatic configuration of the server:
|
||||||
|
|
||||||
sudo scripts/start.sh
|
sudo setup/start.sh
|
||||||
|
|
||||||
*(Just a reminder, do this on a fresh Ubuntu 14.04 machine only! If you're reusing an existing server, unpredictable things may happen.)*
|
*(Just a reminder, do this on a fresh Ubuntu 14.04 machine only! If you're reusing an existing server, unpredictable things may happen.)*
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# After this, you'll still need to run dns_update.sh to get the DKIM
|
# After this, you'll still need to run dns_update.sh to get the DKIM
|
||||||
# signature in the DNS zones.
|
# signature in the DNS zones.
|
||||||
|
|
||||||
source scripts/functions.sh # load our functions
|
source setup/functions.sh # load our functions
|
||||||
|
|
||||||
# Install DKIM
|
# Install DKIM
|
||||||
apt_install opendkim opendkim-tools
|
apt_install opendkim opendkim-tools
|
|
@ -1,13 +1,13 @@
|
||||||
# DNS: Configure a DNS server using nsd
|
# DNS: Configure a DNS server using nsd
|
||||||
#######################################
|
#######################################
|
||||||
|
|
||||||
# After running this script, you also must run scripts/dns_update.sh,
|
# After running this script, you also must run setup/dns_update.sh,
|
||||||
# and any time a zone file is added/changed/removed, and any time a
|
# and any time a zone file is added/changed/removed, and any time a
|
||||||
# new domain name becomes in use by a mail user.
|
# new domain name becomes in use by a mail user.
|
||||||
#
|
#
|
||||||
# This script will turn on DNS for $PUBLIC_HOSTNAME.
|
# This script will turn on DNS for $PUBLIC_HOSTNAME.
|
||||||
|
|
||||||
source scripts/functions.sh # load our functions
|
source setup/functions.sh # load our functions
|
||||||
|
|
||||||
# Install nsd, our DNS server software.
|
# Install nsd, our DNS server software.
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
# Install packages.
|
# Install packages.
|
||||||
|
|
||||||
source scripts/functions.sh # load our functions
|
source setup/functions.sh # load our functions
|
||||||
source /etc/mailinabox.conf # load global vars
|
source /etc/mailinabox.conf # load global vars
|
||||||
|
|
||||||
apt_install \
|
apt_install \
|
|
@ -9,7 +9,7 @@
|
||||||
# plugin. The tools/mail.py tool creates the necessary sieve script for each mail
|
# plugin. The tools/mail.py tool creates the necessary sieve script for each mail
|
||||||
# user when the mail user is created.
|
# user when the mail user is created.
|
||||||
|
|
||||||
source scripts/functions.sh # load our functions
|
source setup/functions.sh # load our functions
|
||||||
|
|
||||||
# Install packages.
|
# Install packages.
|
||||||
apt_install spampd razor pyzor dovecot-sieve dovecot-antispam
|
apt_install spampd razor pyzor dovecot-sieve dovecot-antispam
|
|
@ -64,14 +64,14 @@ if [ "$NO_RESTART_SERVICES" == "1" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Start service configuration.
|
# Start service configuration.
|
||||||
. scripts/system.sh
|
. setup/system.sh
|
||||||
. scripts/dns.sh
|
. setup/dns.sh
|
||||||
. scripts/mail.sh
|
. setup/mail.sh
|
||||||
. scripts/dkim.sh
|
. setup/dkim.sh
|
||||||
. scripts/spamassassin.sh
|
. setup/spamassassin.sh
|
||||||
. scripts/dns_update.sh
|
. setup/dns_update.sh
|
||||||
. scripts/web.sh
|
. setup/web.sh
|
||||||
. scripts/webmail.sh
|
. setup/webmail.sh
|
||||||
|
|
||||||
if [ -t 0 ]; then # are we in an interactive shell?
|
if [ -t 0 ]; then # are we in an interactive shell?
|
||||||
if [ -z "`tools/mail.py user`" ]; then
|
if [ -z "`tools/mail.py user`" ]; then
|
|
@ -1,4 +1,4 @@
|
||||||
source scripts/functions.sh # load our functions
|
source setup/functions.sh # load our functions
|
||||||
|
|
||||||
# Base system configuration.
|
# Base system configuration.
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# HTTP: Turn on a web server serving static files
|
# HTTP: Turn on a web server serving static files
|
||||||
#################################################
|
#################################################
|
||||||
|
|
||||||
source scripts/functions.sh # load our functions
|
source setup/functions.sh # load our functions
|
||||||
|
|
||||||
apt_install nginx php5-cgi
|
apt_install nginx php5-cgi
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Webmail: Using roundcube
|
# Webmail: Using roundcube
|
||||||
##########################
|
##########################
|
||||||
|
|
||||||
source scripts/functions.sh # load our functions
|
source setup/functions.sh # load our functions
|
||||||
source /etc/mailinabox.conf # load global vars
|
source /etc/mailinabox.conf # load global vars
|
||||||
|
|
||||||
# Ubuntu's roundcube-core has dependencies on Apache & MySQL, which we don't want, so we can't
|
# Ubuntu's roundcube-core has dependencies on Apache & MySQL, which we don't want, so we can't
|
Loading…
Reference in a new issue