github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2259 from andrewsomething/installer-fix

Browse Source 
Don't run DeleteInstallerThread() until after set_debconf_selection
This commit is contained in:
Jose Diaz-Gonzalez
2016-06-20 20:21:23 -04:00
committed by GitHub
parent a79cd7aebf 3762b7b9f9
commit ecd47dcdeb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/dokku-installer.py
View File

@@ -107,14 +107,14 @@ class GetHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
proc.stdin.close() proc.stdin.close()
proc.wait() proc.wait()
if 'selfdestruct' in sys.argv:
DeleteInstallerThread()
set_debconf_selection('boolean', 'skip_key_file', 'true') set_debconf_selection('boolean', 'skip_key_file', 'true')
set_debconf_selection('boolean', 'vhost_enable', vhost_enable) set_debconf_selection('boolean', 'vhost_enable', vhost_enable)
set_debconf_selection('boolean', 'web_config', 'false') set_debconf_selection('boolean', 'web_config', 'false')
set_debconf_selection('string', 'hostname', params['hostname'].value) set_debconf_selection('string', 'hostname', params['hostname'].value)
if 'selfdestruct' in sys.argv:
DeleteInstallerThread()
self.send_response(200) self.send_response(200)
self.end_headers() self.end_headers()
self.wfile.write(json.dumps({'status': 'ok'})) self.wfile.write(json.dumps({'status': 'ok'}))