diff --git a/actions/letsencrypt b/actions/letsencrypt index 7dd4a6116..afa74a0cd 100755 --- a/actions/letsencrypt +++ b/actions/letsencrypt @@ -60,7 +60,7 @@ APACHE_CONFIGURATION = ''' CustomLog ${{APACHE_LOG_DIR}}/ssl_access.log combined # GnuTLS Switch: Enable/Disable SSL/TLS for this virtual host. GnuTLSEnable On - # Automatically obtained certficates from Let's Encrypt + # Automatically obtained certificates from Let's Encrypt GnuTLSCertificateFile /etc/letsencrypt/live/{domain}/fullchain.pem GnuTLSKeyFile /etc/letsencrypt/live/{domain}/privkey.pem # See http://www.outoforder.cc/projects/apache/mod_gnutls/docs/#GnuTLSPriorities @@ -82,14 +82,14 @@ def parse_arguments(): revoke_parser.add_argument( '--domain', help='Domain name to revoke certificate for') obtain_parser = subparsers.add_parser( - 'obtain', help='Obtain certficate for a domain and setup website.') + 'obtain', help='Obtain certificate for a domain and setup website.') obtain_parser.add_argument( '--domain', help='Domain name to obtain certificate for') return parser.parse_args() -def get_certficate_expiry(domain): +def get_certificate_expiry(domain): """Return the expiry date of a certificate.""" certificate_file = os.path.join(LIVE_DIRECTORY, domain, 'cert.pem') output = subprocess.check_output(['openssl', 'x509', '-enddate', '-noout', @@ -111,7 +111,7 @@ def subcommand_get_status(_): for domain in domains: domain_status[domain] = { 'certificate_available': True, - 'expiry_date': get_certficate_expiry(domain), + 'expiry_date': get_certificate_expiry(domain), 'web_enabled': action_utils.webserver_is_enabled(domain, kind='site') } diff --git a/plinth/modules/letsencrypt/__init__.py b/plinth/modules/letsencrypt/__init__.py index a9a86b45f..c6248e191 100644 --- a/plinth/modules/letsencrypt/__init__.py +++ b/plinth/modules/letsencrypt/__init__.py @@ -39,12 +39,12 @@ title = _('Certificates (Let\'s Encrypt)') description = [ format_lazy( - _('A digital certficate allows users of a web service to verify the ' + _('A digital certificate allows users of a web service to verify the ' 'identity of the service and to securely communicate with it. ' '{box_name} can automatically obtain and setup digital ' 'certificates for each available domain. It does so by proving ' 'itself to be the owner of a domain to Let\'s Encrypt, a ' - 'certficate authority (CA).'), box_name=_(cfg.box_name)), + 'certificate authority (CA).'), box_name=_(cfg.box_name)), _('Let\'s Encrypt is a free, automated, and open certificate ' 'authority, run for the public\'s benefit by the Internet Security ' diff --git a/plinth/modules/letsencrypt/templates/letsencrypt.html b/plinth/modules/letsencrypt/templates/letsencrypt.html index 9460a81c0..9d6264d2a 100644 --- a/plinth/modules/letsencrypt/templates/letsencrypt.html +++ b/plinth/modules/letsencrypt/templates/letsencrypt.html @@ -59,7 +59,7 @@ {% else %} - {% trans "No certficate" %} + {% trans "No certificate" %} {% endif %} diff --git a/plinth/modules/letsencrypt/views.py b/plinth/modules/letsencrypt/views.py index f9551be45..2b51f04a3 100644 --- a/plinth/modules/letsencrypt/views.py +++ b/plinth/modules/letsencrypt/views.py @@ -48,7 +48,7 @@ def index(request): @require_POST def revoke(request, domain): - """Revoke a certficate for a given domain.""" + """Revoke a certificate for a given domain.""" try: actions.superuser_run('letsencrypt', ['revoke', '--domain', domain]) messages.success( @@ -65,7 +65,7 @@ def revoke(request, domain): @require_POST def obtain(request, domain): - """Obtain and install a certficate for a given domain.""" + """Obtain and install a certificate for a given domain.""" try: actions.superuser_run('letsencrypt', ['obtain', '--domain', domain]) messages.success(