imp: auto create nginx certs

Author: Tardo

README.md

@@ -79,6 +79,7 @@ docker cp privoxy:/usr/local/etc/privoxy/CA/privoxy-ca-bundle.crt .
 
 - Update the Trusted CA file: `docker exec privoxy privman --update-trusted-ca`
 - Regenerate the .crt bundle: `docker exec privoxy privman --regenerate-crt-bundle`
+- Regenerate nginx certificates: `docker exec privoxy privman --regenerate-nginx-certs`
 - Update 'adblock' filters: `docker exec privoxy privman --update-adblock-filters`
 - Add a domain to the blocklist: `docker exec privoxy privman --add-blocklist .google. .facebook.`
 - Remove a domain from the blocklist: `docker exec privoxy privman --remove-blocklist .facebook.`

bin/privman.py

@@ -54,6 +54,9 @@ def generate_crt_bundle(subj, subj_nginx, forced=False):
         generate_nginx_certs(subj_nginx, ca_bundle_file, ca_key_file)
     else:
         print_log("CRT Bundle", "Nothing to do. The file already exists.")
+        nginx_cert_file = os.path.join(BASEDIR_CA, "nginx.crt")
+        if not os.path.isfile(nginx_cert_file):
+            generate_nginx_certs(subj_nginx, ca_bundle_file, ca_key_file)
 
 
 def generate_nginx_certs(subj, ca_bundle_file, ca_key_file):
@@ -280,6 +283,12 @@ def remove_blocklist(urls):
         action="store_true",
         default=False,
     )
+    parser.add_argument(
+        "--regenerate-nginx-certs",
+        help="Regenerate nginx certificates",
+        action="store_true",
+        default=False,
+    )
     parser.add_argument(
         "--crt-bundle-subj",
         type=str,
@@ -350,6 +359,12 @@ def remove_blocklist(urls):
         need_restart = generate_crt_bundle(
             args.crt_bundle_subj, args.nginx_subj, forced=True
         )
+    if args.regenerate_nginx_certs:
+        ca_bundle_file = os.path.join(BASEDIR_CA, "privoxy-ca-bundle.crt")
+        ca_key_file = os.path.join(BASEDIR_CA, "cakey.pem")
+        need_restart = generate_nginx_certs(
+            args.nginx_subj, ca_bundle_file, ca_key_file
+        )
     if args.update_adblock_filters:
         need_restart = update_adblock_filters()
     if args.add_whitelist: