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

Fixes on deployment

This commit is contained in:
Marc Aymerich 2015-10-01 19:02:39 +00:00
parent 00eb988952
commit 176c33aaf0
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
orchestra/management/commands/setupnginx.py
View File

@ -130,10 +130,15 @@ class Command(BaseCommand):
'subject': ''.join(('/%s=%s' % (k,v) for k,v in subject.items())), 'subject': ''.join(('/%s=%s' % (k,v) for k,v in subject.items())),
'key_path': key_path, 'key_path': key_path,
'cert_path': cert_path, 'cert_path': cert_path,
'cert_root': os.path.dirname(cert_path),
} }
self.stdout.write('writing new cert to \'%s\'' % cert_path) self.stdout.write('writing new cert to \'%s\'' % cert_path)
self.stdout.write('writing new cert key to \'%s\'' % key_path) self.stdout.write('writing new cert key to \'%s\'' % key_path)
run('openssl req -x509 -nodes -days 365 -newkey rsa:4096 -keyout %(key_path)s -out %(cert_path)s -subj "%(subject)s"' % context, display=True) run(textwrap.dedent("""\
openssl req -x509 -nodes -days 365 -newkey rsa:4096 -keyout %(key_path)s -out %(cert_path)s -subj "%(subject)s"
chown --reference=%(cert_root)s %(cert_path)s %(key_path)s\
""") % context, display=True
)
return cert_path, key_path return cert_path, key_path
@check_root @check_root
@ -233,8 +238,12 @@ class Command(BaseCommand):
if not confirm("\n\nFile %(file)s be updated, do you like to overide " if not confirm("\n\nFile %(file)s be updated, do you like to overide "
"it? (yes/no): " % context): "it? (yes/no): " % context):
return return
run("cp %(file)s %(file)s.save" % context, display=True) run(textwrap.dedent("""\
run("cat << 'EOF' > %(file)s\n%(conf)s\nEOF" % context, display=True) cp %(file)s %(file)s.save
cat << 'EOF' > %(file)s
%(conf)s
EOF""") % context, display=True
)
self.stdout.write("\033[1;31mA new version of %(file)s has been installed.\n " self.stdout.write("\033[1;31mA new version of %(file)s has been installed.\n "
"The old version has been placed at %(file)s.save\033[m" % context) "The old version has been placed at %(file)s.save\033[m" % context)