From 91118afbe227a42cd4849ce065f74f3719e89d01 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Tue, 11 Nov 2014 17:30:33 -0200 Subject: [PATCH] Move all vagrant stuff to a single directory --- Vagrantfile | 2 +- vagrant.d/00-colab-generic | 7 ------- vagrant.d/10-mailman-debian | 118 ---------------------------------------------------------------------------------------------------------------------- vagrant.sh | 18 ------------------ vagrant/provision.d/00-colab-generic | 7 +++++++ vagrant/provision.d/10-mailman-debian | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ vagrant/provision.sh | 18 ++++++++++++++++++ 7 files changed, 144 insertions(+), 144 deletions(-) delete mode 100755 vagrant.d/00-colab-generic delete mode 100755 vagrant.d/10-mailman-debian delete mode 100755 vagrant.sh create mode 100755 vagrant/provision.d/00-colab-generic create mode 100755 vagrant/provision.d/10-mailman-debian create mode 100755 vagrant/provision.sh diff --git a/Vagrantfile b/Vagrantfile index 7dae607..c940581 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -12,7 +12,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.provision 'shell', path: 'proxy.sh', args: [proxy] end - config.vm.provision 'shell', path: 'vagrant.sh' + config.vm.provision 'shell', path: 'vagrant/provision.sh' config.vm.network :forwarded_port, guest: 8000, host: 8000 # Colab (runserver) end diff --git a/vagrant.d/00-colab-generic b/vagrant.d/00-colab-generic deleted file mode 100755 index d06ddb8..0000000 --- a/vagrant.d/00-colab-generic +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -set -e - -# colab -/vagrant/colab/vagrant/bootstrap.sh -sudo -u vagrant -i /vagrant/colab/vagrant/provision.sh diff --git a/vagrant.d/10-mailman-debian b/vagrant.d/10-mailman-debian deleted file mode 100755 index 1d9fb76..0000000 --- a/vagrant.d/10-mailman-debian +++ /dev/null @@ -1,118 +0,0 @@ -#!/bin/sh - -set -e - -export DEBIAN_FRONTEND=noninteractive - -if [ ! -f /etc/apt/sources.list.d/mailman-api.list ]; then - cat > /etc/apt/sources.list.d/mailman-api.list <> $conffile - fi -} - -mailman_config DEFAULT_EMAIL_HOST "'$LISTS_DOMAIN'" -mailman_config MTA None -mailman_config POSTFIX_STYLE_VIRTUAL_DOMAINS "['$LISTS_DOMAIN']" -mailman_config DEB_LISTMASTER "'vagrant@localhost.localdomain'" - -# create mailman's meta-list -sudo -u list newlist --quiet mailman vagrant@localhost.localdomain "pass-mailman" -service mailman restart - -# create some sample lists -for list in $TEST_LISTS; do - if list_lists --bare | grep "$list"; then - echo "$list already exists ..." - else - sudo -u list newlist --quiet "$list" vagrant@localhost.localdomain "pass-$list" - echo 'vagrant@localhost.localdomain' | add_members -r - "$list" - fi -done - -################################################################# -# mailman-api configuration -################################################################# - -# FIXME binding to 0.0.0.0 is too liberal -cat > /etc/default/mailman-api <> /etc/colab/settings.yaml -fi - - -################################################################# -# postfix configuration -################################################################# - -postconf relay_domains="$LISTS_DOMAIN" -postconf transport_maps=hash:/etc/postfix/transport -echo "$LISTS_DOMAIN mailman:" > /etc/postfix/transport -postmap /etc/postfix/transport -service postfix restart - -################################################################# -# post a few message to each list -################################################################# - -for list in $TEST_LISTS; do - for i in $(seq 1 10); do - (echo "this is a test ($i)") | mail -r vagrant@localhost.localdomain -s "test $i" "$list@lists.local" - done -done diff --git a/vagrant.sh b/vagrant.sh deleted file mode 100755 index b1a3547..0000000 --- a/vagrant.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -set -e - -if [ -x /usr/bin/apt-get ]; then - os='debian' -fi - -if [ -x /usr/bin/yum ]; then - os='centos' -fi - -for script in $(find /vagrant/vagrant.d -name '*-generic' -or -name "*-$os" | sort); do - ( - set -x - $script - ) -done diff --git a/vagrant/provision.d/00-colab-generic b/vagrant/provision.d/00-colab-generic new file mode 100755 index 0000000..d06ddb8 --- /dev/null +++ b/vagrant/provision.d/00-colab-generic @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e + +# colab +/vagrant/colab/vagrant/bootstrap.sh +sudo -u vagrant -i /vagrant/colab/vagrant/provision.sh diff --git a/vagrant/provision.d/10-mailman-debian b/vagrant/provision.d/10-mailman-debian new file mode 100755 index 0000000..1d9fb76 --- /dev/null +++ b/vagrant/provision.d/10-mailman-debian @@ -0,0 +1,118 @@ +#!/bin/sh + +set -e + +export DEBIAN_FRONTEND=noninteractive + +if [ ! -f /etc/apt/sources.list.d/mailman-api.list ]; then + cat > /etc/apt/sources.list.d/mailman-api.list <> $conffile + fi +} + +mailman_config DEFAULT_EMAIL_HOST "'$LISTS_DOMAIN'" +mailman_config MTA None +mailman_config POSTFIX_STYLE_VIRTUAL_DOMAINS "['$LISTS_DOMAIN']" +mailman_config DEB_LISTMASTER "'vagrant@localhost.localdomain'" + +# create mailman's meta-list +sudo -u list newlist --quiet mailman vagrant@localhost.localdomain "pass-mailman" +service mailman restart + +# create some sample lists +for list in $TEST_LISTS; do + if list_lists --bare | grep "$list"; then + echo "$list already exists ..." + else + sudo -u list newlist --quiet "$list" vagrant@localhost.localdomain "pass-$list" + echo 'vagrant@localhost.localdomain' | add_members -r - "$list" + fi +done + +################################################################# +# mailman-api configuration +################################################################# + +# FIXME binding to 0.0.0.0 is too liberal +cat > /etc/default/mailman-api <> /etc/colab/settings.yaml +fi + + +################################################################# +# postfix configuration +################################################################# + +postconf relay_domains="$LISTS_DOMAIN" +postconf transport_maps=hash:/etc/postfix/transport +echo "$LISTS_DOMAIN mailman:" > /etc/postfix/transport +postmap /etc/postfix/transport +service postfix restart + +################################################################# +# post a few message to each list +################################################################# + +for list in $TEST_LISTS; do + for i in $(seq 1 10); do + (echo "this is a test ($i)") | mail -r vagrant@localhost.localdomain -s "test $i" "$list@lists.local" + done +done diff --git a/vagrant/provision.sh b/vagrant/provision.sh new file mode 100755 index 0000000..5339727 --- /dev/null +++ b/vagrant/provision.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +set -e + +if [ -x /usr/bin/apt-get ]; then + os='debian' +fi + +if [ -x /usr/bin/yum ]; then + os='centos' +fi + +for script in $(find /vagrant/vagrant/provision.d -name '*-generic' -or -name "*-$os" | sort); do + ( + set -x + $script + ) +done -- libgit2 0.21.2