From: Steinar H. Gunderson Date: Sun, 16 Apr 2023 10:59:58 +0000 (+0200) Subject: Rename letsencrypt to certbot everywhere. X-Git-Url: https://git.sesse.net/?p=letsencrypt-varnish-plugin;a=commitdiff_plain;h=2f047981e4873de2c65e84083fb23c79ec8f1126 Rename letsencrypt to certbot everywhere. --- diff --git a/varnish.py b/varnish.py index 650bcbb..a1d1448 100644 --- a/varnish.py +++ b/varnish.py @@ -19,10 +19,10 @@ logger = logging.getLogger(__name__) def vcl_recv_line(achall): # Don't bother checking for the right host, we could be coming in through a redirect. - return 'if (req.url == "/%s/%s") { return (synth(999, "Challenge")); } # Added by letsencrypt Varnish plugin for authentication\n' % (achall.URI_ROOT_PATH, achall.chall.encode("token")) + return 'if (req.url == "/%s/%s") { return (synth(999, "Challenge")); } # Added by certbot Varnish plugin for authentication\n' % (achall.URI_ROOT_PATH, achall.chall.encode("token")) def vcl_synth_line(validation): - return 'if (resp.status == 999) { set resp.status = 200; set resp.http.Content-Type = "text/plain"; synthetic("%s"); return (deliver); } # Added by letsencrypt Varnish plugin for authentication\n' % (validation); + return 'if (resp.status == 999) { set resp.status = 200; set resp.http.Content-Type = "text/plain"; synthetic("%s"); return (deliver); } # Added by certbot Varnish plugin for authentication\n' % (validation); @implementer(interfaces.IAuthenticator) @provider(interfaces.IPluginFactory) @@ -66,7 +66,7 @@ class Authenticator(common.Plugin): found_vcl_synth = False new_content = [] for line in content: - if re.search("# Added by letsencrypt Varnish plugin", line): + if re.search("# Added by certbot Varnish plugin", line): # Don't include this line; left by a previous run. continue new_content.append(line) @@ -78,14 +78,14 @@ class Authenticator(common.Plugin): found_vcl_synth = True if not found_vcl_recv: - new_content.append("sub vcl_recv { # Added by letsencrypt Varnish plugin for authentication\n") + new_content.append("sub vcl_recv { # Added by certbot Varnish plugin for authentication\n") new_content.append(vcl_recv_line(achall)) - new_content.append("} # Added by letsencrypt Varnish plugin for authentication\n") + new_content.append("} # Added by certbot Varnish plugin for authentication\n") if not found_vcl_synth: - new_content.append("sub vcl_synth { # Added by letsencrypt Varnish plugin for authentication\n") + new_content.append("sub vcl_synth { # Added by certbot Varnish plugin for authentication\n") new_content.append(vcl_synth_line(validation)) - new_content.append("} # Added by letsencrypt Varnish plugin for authentication\n") + new_content.append("} # Added by certbot Varnish plugin for authentication\n") with open("/etc/varnish/default.vcl", "w") as vcl: vcl.writelines(new_content)