From 90e3be422fd40577cb8592d0a83c0acea1810920 Mon Sep 17 00:00:00 2001 From: Elliot Saba Date: Sun, 22 Jan 2017 22:58:30 -0800 Subject: [PATCH] Yet another rename --- Dockerfile | 3 ++- Makefile | 6 +++--- README.md | 8 ++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1ac796c..57eed46 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,8 @@ RUN crontab /etc/cron.d/certbot COPY ./scripts/ /scripts RUN chmod +x /scripts/*.sh -# Copy in default nginx configuration +# Copy in default nginx configuration (which just forwards ACME requests to +# certbot, or redirects to HTTPS, but has no HTTPS configurations by default). RUN rm -f /etc/nginx/conf.d/* COPY nginx_conf.d/ /etc/nginx/conf.d/ diff --git a/Makefile b/Makefile index 0f27b73..5575311 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ all: build build: Makefile Dockerfile - docker build --squash -t staticfloat/docker-certbot-cron . - echo "Done! Use docker run staticfloat/docker-certbot-cron to run" + docker build --squash -t staticfloat/nginx-certbot . + @echo "Done! Use docker run staticfloat/nginx-certbot to run" push: - docker push staticfloat/docker-certbot-cron + docker push staticfloat/nginx-certbot diff --git a/README.md b/README.md index 5e084b5..7f769bb 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# docker-certbot-cron -Create and automatically renew website SSL certificates using the letsencrypt free certificate authority, and its client *certbot*. +# docker-nginx-certbot +Create and automatically renew website SSL certificates using the letsencrypt free certificate authority, and its client *certbot*, built on top of the nginx server. # More information @@ -7,12 +7,12 @@ Find out more about letsencrypt: https://letsencrypt.org Certbot github: https://github.com/certbot/certbot -This repository was originally forked from `@henridwyer`, many thanks to him for the good idea. I've rewritten about 90% of this repository, so it bears almost no resemblance to the original. This repository is _much_ more opinionated about the structure of your webservers/code, however it is easier to use as long as all of your webservers follow that pattern. +This repository was originally forked from `@henridwyer`, many thanks to him for the good idea. I've rewritten about 90% of this repository, so it bears almost no resemblance to the original. This repository is _much_ more opinionated about the structure of your webservers/containers, however it is easier to use as long as all of your webservers follow that pattern. # Changelog ### 0.7 -- Complete rewrite, build this image on top of the `nginx` image, and run `cron` alongside `nginx` so that we can have nginx configs dynamically enabled as we get SSL certificates. +- Complete rewrite, build this image on top of the `nginx` image, and run `cron`/`certbot` alongside `nginx` so that we can have nginx configs dynamically enabled as we get SSL certificates. ### 0.6 - Add `nginx_auto_enable.sh` script to `/etc/letsencrypt/` so that users can bring nginx up before SSL certs are actually available.