pangea
/
django-orchestra
7
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Projects Releases Wiki Activity

deploy.sh: make sure git is installed

This commit is contained in:
Marc 2014-10-04 21:31:00 +00:00
parent bdf7c1d473
commit 5786132ca8
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
orchestra/apps/domains/tests/functional_tests/tests.py
View File

@ -197,7 +197,7 @@ class DomainTestMixin(object):
self.addCleanup(partial(self.delete, self.domain_name)) self.addCleanup(partial(self.delete, self.domain_name))
self.update(self.domain_name, self.domain_update_records) self.update(self.domain_name, self.domain_update_records)
self.add(self.www_name, self.www_records) self.add(self.www_name, self.www_records)
time.sleep(1) time.sleep(0.5)
self.validate_update(self.MASTER_SERVER_ADDR, self.domain_name) self.validate_update(self.MASTER_SERVER_ADDR, self.domain_name)
time.sleep(5) time.sleep(5)
self.validate_update(self.SLAVE_SERVER_ADDR, self.domain_name) self.validate_update(self.SLAVE_SERVER_ADDR, self.domain_name)

8
orchestra/bin/orchestra-admin
View File

@ -195,14 +195,18 @@ function install_requirements () {
run update-rc.d rabbitmq-server defaults run update-rc.d rabbitmq-server defaults
# Patch passlib # Patch passlib
from collections import OrderedDict
IMPORT="from django.contrib.auth.hashers import mask_hash, _" IMPORT="from django.contrib.auth.hashers import mask_hash, _"
COLLECTIONS="from collections import OrderedDict" COLLECTIONS="from collections import OrderedDict"
sed -i "s/${IMPORT}, SortedDict/${IMPORT}\n ${COLLECTIONS}/" \ sed -i "s/${IMPORT}, SortedDict/${IMPORT}\n ${COLLECTIONS}/" \
/usr/local/lib/python2.7/dist-packages/passlib/ext/django/utils.py /usr/local/lib/python2.7/dist-packages/passlib/ext/django/utils.py
sed -i "s/SortedDict/OrderedDict/g" \ sed -i "s/SortedDict/OrderedDict/g" \
/usr/local/lib/python2.7/dist-packages/passlib/ext/django/utils.py /usr/local/lib/python2.7/dist-packages/passlib/ext/django/utils.py
# Patch dateutil
sed -i "s/elif not isinstance(dt2, datetime.datetime):/else:/" \
/usr/local/lib/python2.7/dist-packages/dateutil/relativedelta.py
sed -i "s/if not type(dt1) == type(dt2): #isinstance(dt1, type(dt2)):/if not isinstance(dt2, type(dt1)):/" \
/usr/local/lib/python2.7/dist-packages/dateutil/relativedelta.py
} }
export -f install_requirements export -f install_requirements