Changeset 2813

Timestamp:

Dec 16, 2016, 1:18:57 AM (7 years ago)

Author:

andersk

Message:

export-scripts-certs: Add sanity check for key file existence

File:

• trunk/server/fedora/config/etc/httpd/export-scripts-certs (modified) (4 diffs)

trunk/server/fedora/config/etc/httpd/export-scripts-certs

@@ -26 +26 @@
 
 cert_filenames = set()
+error = False
 
 def conf(vhost):
@@ -42 +43 @@
         os.rename(cert_path + '.new', cert_path)
 
+    key_path = os.path.join('/etc/pki/tls/private', key_filename)
+    if not os.path.exists(key_path):
+        sys.stderr.write("Error: key file {} does not exist for vhost {}\n".format(key_path, name))
+        global error
+        error = True
+        return
+
     for port in 443, 444:
         yield '<VirtualHost *:{}>\n'.format(port)
@@ -52 +60 @@
             yield '\tInclude conf.d/vhosts-common-ssl-cert.conf\n'
         yield '\tSSLCertificateFile {}\n'.format(cert_path)
-        yield '\tSSLCertificateKeyFile {}\n'.format(os.path.join('/etc/pki/tls/private', key_filename))
+        yield '\tSSLCertificateKeyFile {}\n'.format(key_path)
         yield '</VirtualHost>\n'
 
@@ -63 +71 @@
     if filename.endswith('.pem') and filename not in cert_filenames:
         os.remove(os.path.join(CERTS_DIR, filename))
+
+sys.exit(1 if error else 0)