From da15ae5375272e7ee9c51d62eedb6e89ea1ad3c3 Mon Sep 17 00:00:00 2001 From: Joshua Tauberer Date: Tue, 3 Jun 2014 11:12:38 +0000 Subject: [PATCH] rename the scripts directory to setup --- Dockerfile | 4 ++-- README.md | 2 +- containers/docker/container_start.sh | 2 +- docs/index.md | 2 +- {scripts => setup}/dkim.sh | 2 +- {scripts => setup}/dns.sh | 4 ++-- {scripts => setup}/dns_update.sh | 0 {scripts => setup}/functions.sh | 0 {scripts => setup}/mail.sh | 2 +- {scripts => setup}/spamassassin.sh | 2 +- {scripts => setup}/start.sh | 16 ++++++++-------- {scripts => setup}/system.sh | 2 +- {scripts => setup}/web.sh | 2 +- {scripts => setup}/webmail.sh | 2 +- 14 files changed, 21 insertions(+), 21 deletions(-) rename {scripts => setup}/dkim.sh (97%) rename {scripts => setup}/dns.sh (90%) rename {scripts => setup}/dns_update.sh (100%) rename {scripts => setup}/functions.sh (100%) rename {scripts => setup}/mail.sh (99%) rename {scripts => setup}/spamassassin.sh (98%) rename {scripts => setup}/start.sh (94%) rename {scripts => setup}/system.sh (97%) rename {scripts => setup}/web.sh (95%) rename {scripts => setup}/webmail.sh (98%) diff --git a/Dockerfile b/Dockerfile index 8f315389..e4c15345 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 # 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 tools /usr/local/mailinabox/tools # Start the configuration. -RUN cd /usr/local/mailinabox && scripts/start.sh +RUN cd /usr/local/mailinabox && setup/start.sh # Configure services for docker. ADD containers/docker /usr/local/mailinabox/containers/docker diff --git a/README.md b/README.md index 4ff667cf..15cd9698 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Please see the initial and very barebones [Documentation](docs/index.md) for mor sudo apt-get install -y git git clone https://github.com/joshdata/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. diff --git a/containers/docker/container_start.sh b/containers/docker/container_start.sh index ce46e0a3..d82ec298 100755 --- a/containers/docker/container_start.sh +++ b/containers/docker/container_start.sh @@ -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 # account yet. cd /usr/local/mailinabox - scripts/start.sh < /dev/null + setup/start.sh < /dev/null fi diff --git a/docs/index.md b/docs/index.md index 32bffe6a..c9f8b0e3 100644 --- a/docs/index.md +++ b/docs/index.md @@ -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: - 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.)* diff --git a/scripts/dkim.sh b/setup/dkim.sh similarity index 97% rename from scripts/dkim.sh rename to setup/dkim.sh index 45925de6..98322dba 100644 --- a/scripts/dkim.sh +++ b/setup/dkim.sh @@ -4,7 +4,7 @@ # After this, you'll still need to run dns_update.sh to get the DKIM # signature in the DNS zones. -source scripts/functions.sh # load our functions +source setup/functions.sh # load our functions # Install DKIM apt_install opendkim opendkim-tools diff --git a/scripts/dns.sh b/setup/dns.sh similarity index 90% rename from scripts/dns.sh rename to setup/dns.sh index d0a2d310..7ef76d96 100644 --- a/scripts/dns.sh +++ b/setup/dns.sh @@ -1,13 +1,13 @@ # 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 # new domain name becomes in use by a mail user. # # 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. diff --git a/scripts/dns_update.sh b/setup/dns_update.sh similarity index 100% rename from scripts/dns_update.sh rename to setup/dns_update.sh diff --git a/scripts/functions.sh b/setup/functions.sh similarity index 100% rename from scripts/functions.sh rename to setup/functions.sh diff --git a/scripts/mail.sh b/setup/mail.sh similarity index 99% rename from scripts/mail.sh rename to setup/mail.sh index 4b86c49d..836375cd 100755 --- a/scripts/mail.sh +++ b/setup/mail.sh @@ -12,7 +12,7 @@ # Install packages. -source scripts/functions.sh # load our functions +source setup/functions.sh # load our functions source /etc/mailinabox.conf # load global vars apt_install \ diff --git a/scripts/spamassassin.sh b/setup/spamassassin.sh similarity index 98% rename from scripts/spamassassin.sh rename to setup/spamassassin.sh index f66a3b29..e2e416d0 100644 --- a/scripts/spamassassin.sh +++ b/setup/spamassassin.sh @@ -9,7 +9,7 @@ # plugin. The tools/mail.py tool creates the necessary sieve script for each mail # user when the mail user is created. -source scripts/functions.sh # load our functions +source setup/functions.sh # load our functions # Install packages. apt_install spampd razor pyzor dovecot-sieve dovecot-antispam diff --git a/scripts/start.sh b/setup/start.sh similarity index 94% rename from scripts/start.sh rename to setup/start.sh index 71267c92..a62e58f2 100755 --- a/scripts/start.sh +++ b/setup/start.sh @@ -64,14 +64,14 @@ if [ "$NO_RESTART_SERVICES" == "1" ]; then fi # Start service configuration. -. scripts/system.sh -. scripts/dns.sh -. scripts/mail.sh -. scripts/dkim.sh -. scripts/spamassassin.sh -. scripts/dns_update.sh -. scripts/web.sh -. scripts/webmail.sh +. setup/system.sh +. setup/dns.sh +. setup/mail.sh +. setup/dkim.sh +. setup/spamassassin.sh +. setup/dns_update.sh +. setup/web.sh +. setup/webmail.sh if [ -t 0 ]; then # are we in an interactive shell? if [ -z "`tools/mail.py user`" ]; then diff --git a/scripts/system.sh b/setup/system.sh similarity index 97% rename from scripts/system.sh rename to setup/system.sh index d1fc5966..493fd43a 100755 --- a/scripts/system.sh +++ b/setup/system.sh @@ -1,4 +1,4 @@ -source scripts/functions.sh # load our functions +source setup/functions.sh # load our functions # Base system configuration. diff --git a/scripts/web.sh b/setup/web.sh similarity index 95% rename from scripts/web.sh rename to setup/web.sh index 93a76f8c..34d684b3 100755 --- a/scripts/web.sh +++ b/setup/web.sh @@ -1,7 +1,7 @@ # 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 diff --git a/scripts/webmail.sh b/setup/webmail.sh similarity index 98% rename from scripts/webmail.sh rename to setup/webmail.sh index 09203d0f..23794909 100755 --- a/scripts/webmail.sh +++ b/setup/webmail.sh @@ -1,7 +1,7 @@ # Webmail: Using roundcube ########################## -source scripts/functions.sh # load our functions +source setup/functions.sh # load our functions 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