From cdea97cfe5bc7e4ca9bdced817c0e0df7df12a68 Mon Sep 17 00:00:00 2001 From: Marc Aymerich Date: Sat, 3 Oct 2015 20:02:43 +0000 Subject: [PATCH] Fixes on deployment --- orchestra/contrib/websites/settings.py | 14 +++----------- scripts/containers/deploy.sh | 4 +++- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/orchestra/contrib/websites/settings.py b/orchestra/contrib/websites/settings.py index ef2fe69c..c366a692 100644 --- a/orchestra/contrib/websites/settings.py +++ b/orchestra/contrib/websites/settings.py @@ -97,21 +97,13 @@ WEBSITES_TRAFFIC_IGNORE_HOSTS = Setting('WEBSITES_TRAFFIC_IGNORE_HOSTS', ) -#WEBSITES_DEFAULT_SSl_CA = getattr(settings, 'WEBSITES_DEFAULT_SSl_CA', -# '') - -#WEBSITES_DEFAULT_SSl_CERT = getattr(settings, 'WEBSITES_DEFAULT_SSl_CERT', -# '') - -#WEBSITES_DEFAULT_SSl_KEY = getattr(settings, 'WEBSITES_DEFAULT_SSl_KEY', -# '') - - +# TODO sane defaults WEBSITES_SAAS_DIRECTIVES = Setting('WEBSITES_SAAS_DIRECTIVES', { '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/'), - '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/'), }, ) diff --git a/scripts/containers/deploy.sh b/scripts/containers/deploy.sh index 3b985981..7ad2cbf1 100644 --- a/scripts/containers/deploy.sh +++ b/scripts/containers/deploy.sh @@ -50,7 +50,7 @@ function install_orchestra () { if [[ -d $python_path/orchestra ]]; then run sudo rm -fr $python_path/orchestra 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 # First Orchestra installation 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" } echo $home/django-orchestra/ | sudo tee "$python_path/orchestra.pth" + else + echo "You may want to execute 'git pull origin master'?" fi 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}