Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(587)

Unified Diff: tools/python/google/platform_utils_linux.py

Issue 5591007: Factor out some SSL specific configs, and add another reference to /var/run t... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/python/google/platform_utils_mac.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/python/google/platform_utils_linux.py
===================================================================
--- tools/python/google/platform_utils_linux.py (revision 68854)
+++ tools/python/google/platform_utils_linux.py (working copy)
@@ -81,6 +81,8 @@
cert_file = google.path_utils.FindUpward(self._base_dir, 'tools',
'python', 'google',
'httpd_config', 'httpd2.pem')
+ ssl_enabled = os.path.exists('/etc/apache2/mods-enabled/ssl.conf')
+
httpd_vars = {
"httpd_executable_path":
os.path.join(self._UnixRoot(), "usr", "sbin", exe_name),
@@ -91,6 +93,8 @@
"mime_types_path": mime_types_path,
"output_dir": output_dir,
"ssl_mutex": "file:"+os.path.join(output_dir, "ssl_mutex"),
+ "ssl_session_cache":
+ "shmcb:" + os.path.join(output_dir, "ssl_scache") + "(512000)",
"user": os.environ.get("USER", "#%d" % os.geteuid()),
"lock_file": os.path.join(output_dir, "accept.lock"),
}
@@ -112,12 +116,18 @@
' -C \'User "%(user)s"\''
' -C \'ServerRoot "%(server_root)s"\''
' -c \'LockFile "%(lock_file)s"\''
- ' -c \'SSLCertificateFile "%(ssl_certificate_file)s"\''
- ' -c \'SSLMutex "%(ssl_mutex)s"\''
)
if document_root:
httpd_cmd_string += ' -C \'DocumentRoot "%(document_root)s"\''
+
+ if ssl_enabled:
+ httpd_cmd_string += (
+ ' -c \'SSLCertificateFile "%(ssl_certificate_file)s"\''
+ ' -c \'SSLMutex "%(ssl_mutex)s"\''
+ ' -c \'SSLSessionCache "%(ssl_session_cache)s"\''
+ )
+
# Save a copy of httpd_cmd_string to use for stopping httpd
self._httpd_cmd_string = httpd_cmd_string % httpd_vars
« no previous file with comments | « no previous file | tools/python/google/platform_utils_mac.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698