Factor out some SSL specific configs, and add another reference to /var/run t...

tools/python/google/platform_utils_linux.py

 #!/usr/bin/python
 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Platform-specific utility methods shared by several scripts."""
 
 import os
 import subprocess
 
@@ skipping 63 matching lines @@
       apache2: boolean if true will cause this function to return start
                command for Apache 2.x as opposed to Apache 1.3.x. This flag
                is ignored on Linux (but preserved here for compatibility in
                function signature with win), where apache2 is used always
     """
 
     exe_name = "apache2"
     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')

[tony, 2010/12/09 23:25:00]

Is this file in the same location on hardy and lucid?

+
     httpd_vars = {
       "httpd_executable_path":
           os.path.join(self._UnixRoot(), "usr", "sbin", exe_name),
       "httpd_conf_path": httpd_conf_path,
       "ssl_certificate_file": cert_file,
       "document_root" : document_root,
       "server_root": os.path.join(self._UnixRoot(), "usr"),
       "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)"),

[tony, 2010/12/09 23:25:00]

Nit: spaces around the +.  Is it standard to put (512000) in the path?

       "user": os.environ.get("USER", "#%d" % os.geteuid()),
       "lock_file": os.path.join(output_dir, "accept.lock"),
     }
 
     google.path_utils.MaybeMakeDirectory(output_dir)
 
     # We have to wrap the command in bash
     # -C: process directive before reading config files
     # -c: process directive after reading config files
     # Apache wouldn't run CGIs with permissions==700 unless we add
     # -c User "<username>"
     httpd_cmd_string = (
       '%(httpd_executable_path)s'
       ' -f %(httpd_conf_path)s'
       ' -c \'TypesConfig "%(mime_types_path)s"\''
       ' -c \'CustomLog "%(output_dir)s/access_log.txt" common\''
       ' -c \'ErrorLog "%(output_dir)s/error_log.txt"\''
       ' -c \'PidFile "%(output_dir)s/httpd.pid"\''
       ' -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
 
     httpd_cmd = [self._bash, "-c", self._httpd_cmd_string]
     return httpd_cmd
 
   def GetStopHttpdCommand(self):
     """Returns a list of strings that contains the command line+args needed to
     stop the http server used in the http tests.
 
     This tries to fetch the pid of httpd (if available) and returns the
     command to kill it. If pid is not available, kill all httpd processes
     """
 
     if not self._httpd_cmd_string:
       return ["true"]   # Haven't been asked for the start cmd yet. Just pass.
     # Add a sleep after the shutdown because sometimes it takes some time for
     # the port to be available again.
     return [self._bash, "-c", self._httpd_cmd_string + ' -k stop && sleep 5']