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-02 11:36:24 +00:00
parent 4fd3fdc664
commit 84e9f44221
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
orchestra/management/commands/setuppostgres.py
View File

@ -48,7 +48,7 @@ class Command(BaseCommand):
help = 'Setup PostgreSQL database.' help = 'Setup PostgreSQL database.'
def run_postgres(self, cmd, *args, **kwargs): def run_postgres(self, cmd, *args, **kwargs):
return run('su postgres -c "psql -c \\"%s\\""' % cmd, *args, display=True, **kwargs) return run('su postgres -c "psql -c \\"%s\\""' % cmd, *args, **kwargs)
@check_root @check_root
def handle(self, *args, **options): def handle(self, *args, **options):

1
scripts/containers/Dockerfile
View File

@ -8,6 +8,7 @@ RUN apt-get -y update && apt-get install -y \
python3-pip \ python3-pip \
wget \ wget \
curl \ curl \
net-tools \
dnsutils \ dnsutils \
rsyslog \ rsyslog \
nano \ nano \

17
scripts/containers/deploy.sh
View File

@ -18,7 +18,10 @@ function main () {
echo " ${bold}\$ ${@}${normal}" echo " ${bold}\$ ${@}${normal}"
${@} ${@}
} }
# Test sudo privileges
sudo true
while true; do while true; do
read -p "Enter a project name [panel]: " project_name read -p "Enter a project name [panel]: " project_name
if [[ "$project_name" == "" ]]; then if [[ "$project_name" == "" ]]; then
@ -37,7 +40,6 @@ function main () {
done done
# TODO detect if already installed and don't ask stupid question # TODO detect if already installed and don't ask stupid question
# TODO setupceleryd shoudl change orchestra_start/stop/restart_services
while true; do while true; do
read -p "Do you want to use celery or cronbeat (orchestra.contrib.tasks) for task execution [cronbeat]? " task read -p "Do you want to use celery or cronbeat (orchestra.contrib.tasks) for task execution [cronbeat]? " task
@ -77,6 +79,17 @@ function main () {
run sudo apt-get install nginx-full uwsgi uwsgi-plugin-python3 run sudo apt-get install nginx-full uwsgi uwsgi-plugin-python3
run sudo python3 -W ignore manage.py setupnginx --user $USER run sudo python3 -W ignore manage.py setupnginx --user $USER
run sudo python3 -W ignore manage.py restartservices run sudo python3 -W ignore manage.py restartservices
run sudo python3 -W ignore manage.py startservices
ip_addr=$(ip addr show eth0 | grep 'inet ' | sed -r "s/.*inet ([^\s]*).*/\1/" | cut -d'/' -f1)
if [[ $ip_addr == '' ]]; then
ip_addr=127.0.0.1
fi
if curl https://$ip_addr/admin/ -I -k -s | grep 'HTTP/1.1 302 FOUND'; then
echo -e "${bold}Orchestra appears to be working at https://${ip_addr}/admin/${normal}\n"
else
echo -e "${bold}Err. Orchestra is not responding at https://${ip_addr}/admin/${normal}\n" >&2
fi
run python3 -W ignore manage.py check --deploy run python3 -W ignore manage.py check --deploy
} }