Merge branch 'automation' into 'master'

Automation improvements to automated deployment; for development environments for now.

Merge branch 'automation' into 'master'
Automation improvements to automated deployment; for development environments for now.
Sergio Oliveira
2 parents 39ffa2ab 898146cf
Showing 5 changed files with 18 additions and 11 deletions Show diff stats
colab/management/initconfig.py
vagrant/bootstrap.sh
vagrant/centos.sh
vagrant/provision.sh
vagrant/ubuntu.sh
@@ -28,16 +28,18 @@ EMAIL_SUBJECT_PREFIX: &#39;[colab]&#39;
  
 SECRET_KEY: '{secret_key}'
  
-SITE_URL: 'http://www.example.com/'
+SITE_URL: 'http://localhost:8000/'
 BROWSERID_AUDIENCES:
-  - http://example.com
-  - https://example.org
-  - http://example.net
+  - http://localhost:8000
+#  - http://example.com
+#  - https://example.org
+#  - http://example.net
  
 ALLOWED_HOSTS:
-  - example.com
-  - example.org
-  - example.net
+  - localhost
+#  - example.com
+#  - example.org
+#  - example.net
  
 ### Uncomment to enable Converse.js
 # CONVERSEJS_ENABLED: True
@@ -11,8 +11,8 @@ done
  
 # very simple OS detection
 if [ -x /usr/bin/apt-get ]; then
-  exec sh $basedir/vagrant/ubuntu.sh
+  exec $basedir/vagrant/ubuntu.sh
 fi
 if [ -x /usr/bin/yum ]; then
-  exec sh $basedir/vagrant/centos.sh
+  exec $basedir/vagrant/centos.sh
 fi
 #!/bin/bash
  
+set -ex
+
 ### Disable annoying plugin
 sed -i'' s/enabled=1/enabled=0/g /etc/yum/pluginconf.d/fastestmirror.conf
  
 #!/bin/bash
  
+set -x
+
 export VIRTUALENVWRAPPER_PYTHON="/usr/bin/python2.7"
  
+set +e
 if [ -f /usr/local/bin/virtualenvwrapper.sh ]; then
     source /usr/local/bin/virtualenvwrapper.sh
 else
@@ -13,6 +16,7 @@ if [ ! -d /home/vagrant/.virtualenvs/colab ]; then
 fi
  
 workon colab
+set -e
  
 for dir in /vagrant/colab /vagrant; do
     if [ -f $dir/setup.py ]; then
 #!/bin/bash
  
-UBUNTU=$(lsb_release -sc)
-
+set -ex
  
 ### Install dependencies
 apt-get update
...	...	@@ -28,16 +28,18 @@ EMAIL_SUBJECT_PREFIX: '[colab]'
28	28
29	29	SECRET_KEY: '{secret_key}'
30	30
31		-SITE_URL: 'http://www.example.com/'
	31	+SITE_URL: 'http://localhost:8000/'
32	32	BROWSERID_AUDIENCES:
33		- - http://example.com
34		- - https://example.org
35		- - http://example.net
	33	+ - http://localhost:8000
	34	+# - http://example.com
	35	+# - https://example.org
	36	+# - http://example.net
36	37
37	38	ALLOWED_HOSTS:
38		- - example.com
39		- - example.org
40		- - example.net
	39	+ - localhost
	40	+# - example.com
	41	+# - example.org
	42	+# - example.net
41	43
42	44	### Uncomment to enable Converse.js
43	45	# CONVERSEJS_ENABLED: True
...	...
...	...	@@ -11,8 +11,8 @@ done
11	11
12	12	# very simple OS detection
13	13	if [ -x /usr/bin/apt-get ]; then
14		- exec sh $basedir/vagrant/ubuntu.sh
	14	+ exec $basedir/vagrant/ubuntu.sh
15	15	fi
16	16	if [ -x /usr/bin/yum ]; then
17		- exec sh $basedir/vagrant/centos.sh
	17	+ exec $basedir/vagrant/centos.sh
18	18	fi
...	...
1	1	#!/bin/bash
2	2
	3	+set -ex
	4	+
3	5	### Disable annoying plugin
4	6	sed -i'' s/enabled=1/enabled=0/g /etc/yum/pluginconf.d/fastestmirror.conf
5	7
...	...
1	1	#!/bin/bash
2	2
	3	+set -x
	4	+
3	5	export VIRTUALENVWRAPPER_PYTHON="/usr/bin/python2.7"
4	6
	7	+set +e
5	8	if [ -f /usr/local/bin/virtualenvwrapper.sh ]; then
6	9	source /usr/local/bin/virtualenvwrapper.sh
7	10	else
...	...	@@ -13,6 +16,7 @@ if [ ! -d /home/vagrant/.virtualenvs/colab ]; then
13	16	fi
14	17
15	18	workon colab
	19	+set -e
16	20
17	21	for dir in /vagrant/colab /vagrant; do
18	22	if [ -f $dir/setup.py ]; then
...	...
1	1	#!/bin/bash
2	2
3		-UBUNTU=$(lsb_release -sc)
4		-
	3	+set -ex
5	4
6	5	### Install dependencies
7	6	apt-get update
...	...