Download as
Browse Code »

Commit 9749cb50c2ad21c2a6d4b6b9ab39097b989f7eb9

Authored by Antonio Terceiro
1 parent 6c881b0b
Exists in r5_design and in 1 other branch design_41_backup

simplify deployment of development environment

Showing 4 changed files with 16 additions and 39 deletions   Show diff stats
.mrconfig
  Diff comments   View file @9749cb5
1 1 [.]
2 2  
3 3 [colab]
4   -checkout = git clone https://github.com/colab-community/colab.git --branch master
  4 +checkout = git clone https://github.com/colab-community/colab.git --branch pypi
5 5  
6 6 [mailman-api]
7 7 checkout = git clone https://github.com/TracyWebTech/mailman-api.git
... ...
Vagrantfile
  Diff comments   View file @9749cb5
... ... @@ -6,4 +6,11 @@ VAGRANTFILE_API_VERSION = "2"
6 6  
7 7 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
8 8 config.vm.box = "centos6"
  9 +
  10 + proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
  11 + if proxy
  12 + config.vm.provision 'shell', path: 'proxy.sh', args: [proxy]
  13 + end
  14 +
  15 + config.vm.provision 'shell', path: 'vagrant.sh'
9 16 end
... ...
dev-install.sh
  Diff comments   View file @9749cb5
... ... @@ -2,42 +2,4 @@
2 2  
3 3 set -e
4 4  
5   -vagrant up
6 5  
7   -if [ -z "$http_proxy" ]; then
8   - http_proxy=$(vagrant ssh -- sh -c '. /etc/profile.d/http_proxy.sh 2>/dev/null; echo $http_proxy')
9   -fi
10   -
11   -if [ -z "$http_proxy" ]; then
12   - printf "HTTP Proxy[none]: "
13   - read http_proxy
14   -fi
15   -
16   -if [ -n "$http_proxy" ]; then
17   - vagrant ssh -- sudo /vagrant/proxy.sh $http_proxy
18   - export http_proxy
19   -fi
20   -
21   -host=$(vagrant ssh-config | awk '{ if ($1 == "HostName") { print($2) }}')
22   -port=$(vagrant ssh-config | awk '{ if ($1 == "Port") { print($2) }}')
23   -key=$(vagrant ssh-config | awk '{ if ($1 == "IdentityFile") { print($2) }}')
24   -
25   -cat > colab/environments.json <<EOF
26   -{
27   - "dev": {
28   - "hosts": ["$host"],
29   - "key_filename": "$key",
30   - "port": "$port",
31   - "is_vagrant": true,
32   - "superuser": "vagrant"
33   - }
34   -}
35   -EOF
36   -
37   -dpkg-query --show fabric >/dev/null || sudo apt-get install -qy fabric
38   -
39   -(
40   - cd colab
41   - fab --disable-known-hosts bootstrap
42   - fab --disable-known-hosts deploy
43   -)
... ...
vagrant.sh 0 → 100755
  Diff comments   View file @9749cb5
... ... @@ -0,0 +1,8 @@
  1 +#!/bin/sh
  2 +
  3 +set -e
  4 +cd /vagrant
  5 +
  6 +# colab
  7 +sh ./colab/vagrant/bootstrap.sh
  8 +sh ./colab/vagrant/provision.sh
... ...