Download as
Browse Code »

Commit 548446aef38ea7adbb486f2b70741ecf843cfadb

Authored by Sergio Oliveira
2 parents 39ffa2ab 4c0e7fc8
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

Merge branch 'centos7'

Showing 6 changed files with 22 additions and 32 deletions   Show diff stats
Vagrantfile
  Diff comments   View file @548446a
... ... @@ -17,7 +17,7 @@ if $stdin.isatty
17 17 puts '------------------------------'
18 18 puts 'precise64 (virtualbox)'
19 19 puts 'trusty64 (virtualbox)'
20   - puts 'centos6.5 (virtualbox)'
  20 + puts 'centos7.0 (virtualbox)'
21 21 puts
22 22 print "Which box to use [#{default_box}]: "
23 23 choice = $stdin.gets.strip
... ... @@ -44,8 +44,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
44 44 config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box"
45 45 when "trusty64"
46 46 config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box"
47   - when "centos6.5"
48   - config.vm.box_url = "https://github.com/2creatives/vagrant-centos/releases/download/v6.5.3/centos65-x86_64-20140116.box"
  47 + when "centos7.0"
  48 + config.vm.box_url = "https://vagrantcloud.com/chef/boxes/centos-7.0/versions/1/providers/virtualbox.box"
49 49 end
50 50  
51 51 config.vm.provision "shell", keep_color: true, path: 'vagrant/bootstrap.sh'
... ...
colab/management/initconfig.py
  Diff comments   View file @548446a
... ... @@ -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
... ...
vagrant/bootstrap.sh 100644 → 100755
  Diff comments   View file @548446a
... ... @@ -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
... ...
vagrant/centos.sh 100644 → 100755
  Diff comments   View file @548446a
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  
6   -### Add PUIAS repo
7   -
8   -yum install curl -y
9   -
10   -if [ ! -f /etc/pki/rpm-gpg/RPM-GPG-KEY-puias ]; then
11   - curl -s http://www.math.ias.edu/data/puias/6/i386/os/RPM-GPG-KEY-puias > /etc/pki/rpm-gpg/RPM-GPG-KEY-puias
12   -fi
13   -
14   -if [ ! -f /etc/yum.repos.d/puias-6-core.repo ]; then
15   - rpm -i --nodeps http://springdale.math.ias.edu/data/puias/6/x86_64/os/Packages/springdale-release-6-6.5.0.45.sdl6.3.x86_64.rpm --replacefiles
16   -
17   - rpm -i --nodeps http://springdale.math.ias.edu/data/puias/6/x86_64/os/Packages/springdale-core-6-2.sdl6.10.noarch.rpm
18   -fi
19   -
20   -if [ ! -f /etc/yum.repos.d/puias-6-computational.repo ]; then
21   - yum install springdale-computational -y
22   -fi
23 8  
24 9 if [ -n "$http_proxy" ]; then
25 10 # force all repositories to always use the same host to take advantage of a
... ... @@ -34,7 +19,7 @@ fi
34 19  
35 20 yum -y groupinstall "Development tools"
36 21  
37   -yum install -y git unzip mercurial libev-devel gettext libxml2-devel libxslt-devel openssl-devel libffi-devel libjpeg-turbo-devel zlib-devel freetype-devel postgresql-devel python27 python27-devel postgresql-server
  22 +yum install -y git unzip mercurial libev-devel gettext libxml2-devel libxslt-devel openssl-devel libffi-devel libjpeg-turbo-devel zlib-devel freetype-devel postgresql-devel python-devel postgresql-server
38 23  
39 24 ### Install Virtualenvwrapper
40 25 which pip2.7 > /dev/null ||
... ...
vagrant/provision.sh 100644 → 100755
  Diff comments   View file @548446a
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
... ...
vagrant/ubuntu.sh 100644 → 100755
  Diff comments   View file @548446a
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
... ...