simplify deployment of development environment

Antonio Terceiro
1 parent 6c881b0b
Showing 4 changed files with 16 additions and 39 deletions Show diff stats
.mrconfig
Vagrantfile
dev-install.sh
vagrant.sh
 [.]
  
 [colab]
-checkout = git clone https://github.com/colab-community/colab.git --branch master
+checkout = git clone https://github.com/colab-community/colab.git --branch pypi
  
 [mailman-api]
 checkout = git clone https://github.com/TracyWebTech/mailman-api.git
@@ -6,4 +6,11 @@ VAGRANTFILE_API_VERSION = &quot;2&quot;
  
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box = "centos6"
+
+  proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
+  if proxy
+    config.vm.provision 'shell', path: 'proxy.sh', args: [proxy]
+  end
+
+  config.vm.provision 'shell', path: 'vagrant.sh'
 end
@@ -2,42 +2,4 @@
  
 set -e
  
-vagrant up
  
-if [ -z "$http_proxy" ]; then
-  http_proxy=$(vagrant ssh -- sh -c '. /etc/profile.d/http_proxy.sh 2>/dev/null; echo $http_proxy')
-fi
-
-if [ -z "$http_proxy" ]; then
-  printf "HTTP Proxy[none]: "
-  read http_proxy
-fi
-
-if [ -n "$http_proxy" ]; then
-  vagrant ssh -- sudo /vagrant/proxy.sh $http_proxy
-  export http_proxy
-fi
-
-host=$(vagrant ssh-config | awk '{ if ($1 == "HostName") { print($2) }}')
-port=$(vagrant ssh-config | awk '{ if ($1 == "Port") { print($2) }}')
-key=$(vagrant ssh-config | awk '{ if ($1 == "IdentityFile") { print($2) }}')
-
-cat > colab/environments.json <<EOF
-{
-  "dev": {
-    "hosts": ["$host"],
-    "key_filename": "$key",
-    "port": "$port",
-    "is_vagrant": true,
-    "superuser": "vagrant"
-  }
-}
-EOF
-
-dpkg-query --show fabric >/dev/null || sudo apt-get install -qy fabric
-
-(
-  cd colab
-  fab --disable-known-hosts bootstrap
-  fab --disable-known-hosts deploy
-)
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+cd /vagrant
+
+# colab
+sh ./colab/vagrant/bootstrap.sh
+sh ./colab/vagrant/provision.sh
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
...	...
...	...	@@ -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
...	...
...	...	@@ -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		-)
...	...
...	...	@@ -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
...	...