x/anvil
Code Issues Proposed changes

Made rhel files constants.

Browse Source
This commit is contained in:
Joshua Harlow 2012-02-06 18:03:49 -08:00
parent 0077985855
commit e58aaf873e
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
devstack/components/horizon.py
View File

@ -73,6 +73,10 @@ APACHE_LOG_LOCATIONS = {
} }
} }
#rhel fixups
RHEL_SOCKET_CONF = "/etc/httpd/conf.d/wsgi_socket_prefix.conf"
RHEL_HTTPD_CONF = '/etc/httpd/conf/httpd.conf'
#users which apache may not like starting as #users which apache may not like starting as
BAD_APACHE_USERS = ['root'] BAD_APACHE_USERS = ['root']
@ -190,12 +194,10 @@ class HorizonInstaller(comp.PythonInstallComponent):
try: try:
sh.root_mode() sh.root_mode()
#fix the socket prefix to someplace we can use #fix the socket prefix to someplace we can use
socket_conf = "/etc/httpd/conf.d/wsgi_socket_prefix.conf" fc = "WSGISocketPrefix %s" % (sh.joinpths(self.log_dir, "wsgi-socket"))
wsgi_socket_loc = sh.joinpths(self.log_dir, "wsgi-socket") sh.write_file(RHEL_SOCKET_CONF, fc)
fc = "WSGISocketPrefix %s" % (wsgi_socket_loc)
sh.write_file(socket_conf, fc)
#now adjust the run user and group #now adjust the run user and group
fc = sh.load_file('/etc/httpd/conf/httpd.conf') fc = sh.load_file(RHEL_HTTPD_CONF)
lines = fc.splitlines() lines = fc.splitlines()
new_lines = list() new_lines = list()
for line in lines: for line in lines:
@ -204,8 +206,8 @@ class HorizonInstaller(comp.PythonInstallComponent):
if line.startswith("Group "): if line.startswith("Group "):
line = "Group %s" % (group) line = "Group %s" % (group)
new_lines.append(line) new_lines.append(line)
contents = utils.joinlinesep(*new_lines) fc = utils.joinlinesep(*new_lines)
sh.write_file('/etc/httpd/conf/httpd.conf', contents) sh.write_file(RHEL_HTTPD_CONF, fc)
finally: finally:
sh.user_mode() sh.user_mode()