Skip to content

Commit 4f0b514

Browse files
authored
v1.2.6 (#13)
Minor update * Removing request SSL certificates on init
1 parent dc6aeab commit 4f0b514

File tree

6 files changed

+8
-20
lines changed

6 files changed

+8
-20
lines changed

Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ LABEL maintainer="Ben Green <[email protected]>" \
1010
EXPOSE 443
1111

1212
ENV \
13-
# clean all config and certificates before doing anything else
14-
CLEAN_INSTALL=0 \
1513
# used for renewal notification emails
1614
LETS_ENCRYPT_EMAIL= \
15+
# clean all config and certificates before doing anything else
16+
CLEAN_INSTALL=0 \
1717
# set to 1 to use live instead of staging server
1818
LETS_ENCRYPT_LIVE=0 \
1919
# set to the number of bits to use for generating DHPARAM
@@ -22,8 +22,6 @@ ENV \
2222
SSL_REDIRECT_INSECURE=0 \
2323
# canonical domain name redirection
2424
SSL_REDIRECT_TO_CANONICAL=0 \
25-
# automatically request certificates on startup - only use if you don't need any additional configuration
26-
SSL_REQUEST_ON_STARTUP=0 \
2725
# set to true to skip local HTTP token check
2826
GETSSL_SKIP_HTTP_TOKEN_CHECK="false"
2927

Dockerfile-automated

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ LABEL maintainer="Ben Green <[email protected]>" \
1010
EXPOSE 443
1111

1212
ENV \
13-
# clean all config and certificates before doing anything else
14-
CLEAN_INSTALL=0 \
1513
# used for renewal notification emails
1614
LETS_ENCRYPT_EMAIL= \
15+
# clean all config and certificates before doing anything else
16+
CLEAN_INSTALL=0 \
1717
# set to 1 to use live instead of staging server
1818
LETS_ENCRYPT_LIVE=0 \
1919
# set to the number of bits to use for generating DHPARAM
@@ -22,8 +22,6 @@ ENV \
2222
SSL_REDIRECT_INSECURE=0 \
2323
# canonical domain name redirection
2424
SSL_REDIRECT_TO_CANONICAL=0 \
25-
# automatically request certificates on startup - only use if you don't need any additional configuration
26-
SSL_REQUEST_ON_STARTUP=0 \
2725
# set to true to skip local HTTP token check
2826
GETSSL_SKIP_HTTP_TOKEN_CHECK="false"
2927

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
[Docker Repository](https://hub.docker.com/r/bcgdesign/nginx-proxy) - [bcg|design ecosystem](https://github.com/bencgreen/docker)
66

7-
Nginx Proxy which uses [getssl](https://github.com/srvrco/getssl) to automate requesting and renewing SSL certificates via Let's Encrypt. Certificates are checked for renewal every week - the last check can be viewed in the `/ssl` volume.
7+
Nginx Proxy which uses [getssl](https://github.com/srvrco/getssl) to automate requesting and renewing SSL certificates via Let's Encrypt. Certificates are checked for renewal every day - the last check can be viewed in the `/ssl` volume.
88

99
## Contents
1010

@@ -40,7 +40,6 @@ For SSL certificate requests to work correctly, ports 80 and 443 need mapping fr
4040
| `SSL_DHPARAM_BITS` | A valid integer | The size of your DHPARAM variables - adjust down only if you have limited processing resources. | 4096 |
4141
| `SSL_REDIRECT_INSECURE` | 0 or 1 | If 1, all insecured (HTTP) requests will be upgraded by Nginx to secure (HTTPS). | 0 |
4242
| `SSL_REDIRECT_TO_CANONICAL` | 0 or 1 | If 1, all requests will be redirected to the primary domain (defined in `conf.sh`). | 0 |
43-
| `SSL_REQUEST_ON_STARTUP` | 0 or 1 | If 1, SSL certificates will be automatically requested - otherwise you'll need to use `ssl-request`. | 0 |
4443
| `GETSSL_SKIP_HTTP_TOKEN_CHECK` | true or false | Set to true to enable `getssl`'s [skip HTTP token check](https://github.com/srvrco/getssl/wiki/Config-variables#skip_http_token_checkfalse). | false |
4544

4645
## Helper Functions
@@ -73,5 +72,5 @@ The image contains a handful of useful Nginx configuration 'helper' files, which
7372
7473
## Copyright
7574

76-
> Copyright (c) 2021 Ben Green <https://bcgdesign.com>
75+
> Copyright (c) 2021 Ben Green <https://bcgdesign.com>
7776
> Unless otherwise stated

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.2.5
1+
1.2.6

overlay/etc/cont-init.d/20-paths

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ add_env "SSL" ${SSL}
3434

3535
SSL_CERTS=${SSL}/certs
3636
add_env "SSL_CERTS" "${SSL_CERTS}"
37-
add_env "SSL_DHPARAM" ${SSL_CERTS}/dhparam.pem
37+
add_env "SSL_DHPARAM" "${SSL_CERTS}/dhparam.pem"
3838
add_env "SSL_GLOBAL_CFG" "${SSL_CERTS}/${GETSSL_CFG}"
3939

4040
add_env "SITES" "/sites"

overlay/usr/local/bin/ssl-init

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,3 @@ set -euo pipefail
99

1010
s6-setuidgid www /etc/ssl/init
1111
nginx-reload
12-
13-
14-
#======================================================================================================================
15-
# Request certificates
16-
#======================================================================================================================
17-
18-
[[ "${SSL_REQUEST_ON_STARTUP}" = "1" ]] && ssl-request

0 commit comments

Comments
 (0)