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

Merge pull request #4058 from hugopeixoto/fix/chown-vhost

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2020-07-13 21:09:39 -04:00
committed by GitHub
parent 0403978ade aba5d03632
commit 613dd3d1c4
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
contrib/dokku-installer.py
View File

@@ -4,6 +4,7 @@ import cgi
import json import json
import os import os
import re import re
import shutil
try: try:
import SimpleHTTPServer import SimpleHTTPServer
import SocketServer import SocketServer
@@ -143,20 +144,31 @@ class GetHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
'REQUEST_METHOD': 'POST', 'REQUEST_METHOD': 'POST',
'CONTENT_TYPE': self.headers['Content-Type']}) 'CONTENT_TYPE': self.headers['Content-Type']})
vhost_enable = 'false'
dokku_root = os.getenv('DOKKU_ROOT', '/home/dokku') dokku_root = os.getenv('DOKKU_ROOT', '/home/dokku')
dokku_user = os.getenv('DOKKU_SYSTEM_GROUP', 'dokku')
dokku_group = os.getenv('DOKKU_SYSTEM_USER', 'dokku')
vhost_enable = 'false'
vhost_filename = '{0}/VHOST'.format(dokku_root)
if 'vhost' in params and params['vhost'].value == 'true': if 'vhost' in params and params['vhost'].value == 'true':
vhost_enable = 'true' vhost_enable = 'true'
with open('{0}/VHOST'.format(dokku_root), 'w') as f: with open(vhost_filename, 'w') as f:
f.write(params['hostname'].value) f.write(params['hostname'].value)
shutil.chown(vhost_filename, dokku_user, dokku_group)
else: else:
try: try:
os.remove('{0}/VHOST'.format(dokku_root)) os.remove(vhost_filename)
except OSError: except OSError:
pass pass
with open('{0}/HOSTNAME'.format(dokku_root), 'w') as f:
hostname_filename = '{0}/HOSTNAME'.format(dokku_root)
with open(hostname_filename, 'w') as f:
f.write(params['hostname'].value) f.write(params['hostname'].value)
shutil.chown(hostname_filename, dokku_user, dokku_group)
for (index, key) in enumerate(params['keys'].value.splitlines(), 1): for (index, key) in enumerate(params['keys'].value.splitlines(), 1):
user = 'admin' user = 'admin'
if self.admin_user_exists() is not None: if self.admin_user_exists() is not None: