Index: tools/python/google/platform_utils_mac.py |
=================================================================== |
--- tools/python/google/platform_utils_mac.py (revision 68854) |
+++ tools/python/google/platform_utils_mac.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), |
@@ -112,12 +114,17 @@ |
' -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"\'' |
+ ) |
+ |
# Save a copy of httpd_cmd_string to use for stopping httpd |
self._httpd_cmd_string = httpd_cmd_string % httpd_vars |