Download as
Browse Code »

Commit 538f52d194bfbdf58064c02eaafbcf76d681ecd3

Authored by Antonio Terceiro
1 parent 39ffa2ab
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

vagrant provisioning: improve debuging ability

Showing 4 changed files with 9 additions and 4 deletions   Show diff stats
vagrant/bootstrap.sh 100644 → 100755
  Diff comments   View file @538f52d
@@ -11,8 +11,8 @@ done @@ -11,8 +11,8 @@ done
11 11
12 # very simple OS detection 12 # very simple OS detection
13 if [ -x /usr/bin/apt-get ]; then 13 if [ -x /usr/bin/apt-get ]; then
14 - exec sh $basedir/vagrant/ubuntu.sh 14 + exec $basedir/vagrant/ubuntu.sh
15 fi 15 fi
16 if [ -x /usr/bin/yum ]; then 16 if [ -x /usr/bin/yum ]; then
17 - exec sh $basedir/vagrant/centos.sh 17 + exec $basedir/vagrant/centos.sh
18 fi 18 fi
vagrant/centos.sh 100644 → 100755
  Diff comments   View file @538f52d
1 #!/bin/bash 1 #!/bin/bash
2 2
  3 +set -ex
  4 +
3 ### Disable annoying plugin 5 ### Disable annoying plugin
4 sed -i'' s/enabled=1/enabled=0/g /etc/yum/pluginconf.d/fastestmirror.conf 6 sed -i'' s/enabled=1/enabled=0/g /etc/yum/pluginconf.d/fastestmirror.conf
5 7
vagrant/provision.sh 100644 → 100755
  Diff comments   View file @538f52d
1 #!/bin/bash 1 #!/bin/bash
2 2
  3 +set -x
  4 +
3 export VIRTUALENVWRAPPER_PYTHON="/usr/bin/python2.7" 5 export VIRTUALENVWRAPPER_PYTHON="/usr/bin/python2.7"
4 6
  7 +set +e
5 if [ -f /usr/local/bin/virtualenvwrapper.sh ]; then 8 if [ -f /usr/local/bin/virtualenvwrapper.sh ]; then
6 source /usr/local/bin/virtualenvwrapper.sh 9 source /usr/local/bin/virtualenvwrapper.sh
7 else 10 else
@@ -13,6 +16,7 @@ if [ ! -d /home/vagrant/.virtualenvs/colab ]; then @@ -13,6 +16,7 @@ if [ ! -d /home/vagrant/.virtualenvs/colab ]; then
13 fi 16 fi
14 17
15 workon colab 18 workon colab
  19 +set -e
16 20
17 for dir in /vagrant/colab /vagrant; do 21 for dir in /vagrant/colab /vagrant; do
18 if [ -f $dir/setup.py ]; then 22 if [ -f $dir/setup.py ]; then
vagrant/ubuntu.sh 100644 → 100755
  Diff comments   View file @538f52d
1 #!/bin/bash 1 #!/bin/bash
2 2
3 -UBUNTU=$(lsb_release -sc)  
4 - 3 +set -ex
5 4
6 ### Install dependencies 5 ### Install dependencies
7 apt-get update 6 apt-get update