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 09:37:25 +00:00
parent 3b59d2d935
commit eeca05ec55
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,10 +49,7 @@ class Command(BaseCommand):
def run_postgres(self, cmd, *args, **kwargs): def run_postgres(self, cmd, *args, **kwargs):
cmd = cmd.replace("'", "\\'") cmd = cmd.replace("'", "\\'")
return run('su postgres -c "psql -c \\"%s\\""' % cmd, *args, **kwargs) return run('su postgres -c "psql -c \\"%s\\""' % cmd, *args, display=True, **kwargs)
def run_postgres2(self, cmd, *args, **kwargs):
return run('echo su postgres -c "psql -c \\"%s\\""' % cmd, *args, **kwargs)
@check_root @check_root
def handle(self, *args, **options): def handle(self, *args, **options):
@ -77,13 +74,13 @@ class Command(BaseCommand):
msg = ("Postgres user '%(db_user)s' already exists, " msg = ("Postgres user '%(db_user)s' already exists, "
"please provide a password [%(default_db_password)s]: " % context) "please provide a password [%(default_db_password)s]: " % context)
context['db_password'] = input(msg) or context['default_db_password'] context['db_password'] = input(msg) or context['default_db_password']
self.run_postgres2(alter_user % context) self.run_postgres(alter_user % context)
elif options.get('db_password'): elif options.get('db_password'):
self.run_postgres2(alter_user % context) self.run_postgres(alter_user % context)
else: else:
raise CommandError("Postgres user '%(db_user)s' already exists and " raise CommandError("Postgres user '%(db_user)s' already exists and "
"--db_pass has not been provided." % context) "--db_pass has not been provided." % context)
self.run_postgres2(create_database % context) self.run_postgres(create_database % context)
# run(textwrap.dedent("""\ # run(textwrap.dedent("""\
# su postgres -c "psql -c \\"CREATE USER %(db_user)s PASSWORD '%(db_password)s';\\"" || { # su postgres -c "psql -c \\"CREATE USER %(db_user)s PASSWORD '%(db_password)s';\\"" || {