pedro
/
django-orchestra-test
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes on deployment

This commit is contained in:
Marc Aymerich 2015-10-03 20:02:43 +00:00
parent f2e9849337
commit cdea97cfe5
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
orchestra/contrib/websites/settings.py
View File

@ -97,21 +97,13 @@ WEBSITES_TRAFFIC_IGNORE_HOSTS = Setting('WEBSITES_TRAFFIC_IGNORE_HOSTS',
) )
#WEBSITES_DEFAULT_SSl_CA = getattr(settings, 'WEBSITES_DEFAULT_SSl_CA', # TODO sane defaults
# '')
#WEBSITES_DEFAULT_SSl_CERT = getattr(settings, 'WEBSITES_DEFAULT_SSl_CERT',
# '')
#WEBSITES_DEFAULT_SSl_KEY = getattr(settings, 'WEBSITES_DEFAULT_SSl_KEY',
# '')
WEBSITES_SAAS_DIRECTIVES = Setting('WEBSITES_SAAS_DIRECTIVES', WEBSITES_SAAS_DIRECTIVES = Setting('WEBSITES_SAAS_DIRECTIVES',
{ {
'wordpress-saas': ('fpm', '/var/run/fpm/pangea-5.4-fpm.sock', '/home/httpd/wordpress-mu/'), 'wordpress-saas': ('fpm', '/var/run/fpm/pangea-5.4-fpm.sock', '/home/httpd/wordpress-mu/'),
'drupal-saas': ('fpm', '/var/run/fpm/pangea-5.4-fpm.sock', '/home/httpd/drupal-mu/'), 'drupal-saas': ('fpm', '/var/run/fpm/pangea-5.4-fpm.sock', '/home/httpd/drupal-mu/'),
'dokuwiki-saas': ('fpm', '/var/run/fpm/pangea-5.4-fpm.sock', '/home/httpd/moodle-mu/'), 'dokuwiki-saas': ('fpm', '/var/run/fpm/pangea-5.4-fpm.sock', '/home/httpd/dokuwiki-mu/'),
'moodle-saas': ('fpm', '/var/run/fpm/pangea-5.4-fpm.sock', '/home/httpd/moodle-mu/'),
}, },
) )

4
scripts/containers/deploy.sh
View File

@ -50,7 +50,7 @@ function install_orchestra () {
if [[ -d $python_path/orchestra ]]; then if [[ -d $python_path/orchestra ]]; then
run sudo rm -fr $python_path/orchestra run sudo rm -fr $python_path/orchestra
fi fi
orch_version=$(python3 -c "from orchestra import get_version; print(get_version());" 2> /dev/null || false) || true orch_version=$(python3 -c "from orchestra import get_version; print(get_version());" 2> /dev/null)
if [[ ! $orch_version ]]; then if [[ ! $orch_version ]]; then
# First Orchestra installation # First Orchestra installation
run sudo apt-get -y install git python3-pip run sudo apt-get -y install git python3-pip
@ -59,6 +59,8 @@ function install_orchestra () {
surun "export GIT_DIR=$home/django-orchestra/.git; git pull" surun "export GIT_DIR=$home/django-orchestra/.git; git pull"
} }
echo $home/django-orchestra/ | sudo tee "$python_path/orchestra.pth" echo $home/django-orchestra/ | sudo tee "$python_path/orchestra.pth"
else
echo "You may want to execute 'git pull origin master'?"
fi fi
if [[ -L /usr/local/bin/orchestra-admin || -f /usr/local/bin/orchestra-admin ]]; then if [[ -L /usr/local/bin/orchestra-admin || -f /usr/local/bin/orchestra-admin ]]; then
run sudo rm -f /usr/local/bin/{orchestra-admin,orchestra-beat} run sudo rm -f /usr/local/bin/{orchestra-admin,orchestra-beat}