Skip to content

Added support for multiple domain names #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
twofatmonkeys wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Added support for multiple domain names #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ RUN apk update && apk add ca-certificates && rm -rf /var/cache/apk/*
RUN update-ca-certificates
RUN apk add --no-cache certbot certbot-nginx
RUN apk update && apk add --no-cache dcron libcap
RUN apk add --no-cache bash

RUN chown nginx:nginx /usr/sbin/crond \
&& setcap cap_setgid=ep /usr/sbin/crond
Expand Down
6 changes: 4 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,16 @@ If you need to run this image on a different port for `HTTPS`, Eg: change to `44
### Setup Free LetsEncrypt SSL with Automatic Certificate Renewal
***Requirements***
- PUBLIC IPV4 and/or IPV6 address.
- A domain name that resolves to speed test server's IP address.
- A domain name/s that resolves to speed test server's IP address/es.
- Email ID

The following command will generate a Let's Encrypt certificate for your domain name and configure a cron job to automatically renew the certificate.
The following command will generate a Let's Encrypt certificate for your domain name/s and configure a cron job to automatically renew the certificate.

````
docker run -e ENABLE_LETSENCRYPT=True -e DOMAIN_NAME=speedtest.yourdomain.com -e USER_EMAIL=you@yourdomain.pro --restart=unless-stopped --name openspeedtest -d -p 80:3000 -p 443:3001 openspeedtest/latest
````
DOMAIN_NAME may be a single value, Eg: 'speedtest.yourdomain.com' or a comma separated list, Eg: 'speedtest.yourdomain.com,ipv4.speedtest.yourdomain.com,ipv6.speedtest.yourdomain.com'

#### Or use docker-compose.yml
````
version: '3.3'
Expand Down
20 changes: 10 additions & 10 deletions files/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash

ip a | egrep -q 'inet6 '
if [[ $? -ne 0 ]]; then
Expand Down Expand Up @@ -116,24 +116,24 @@ fi

fi


if [ "$DOMAIN_NAME" ]; then
sed -i "/\bYOURDOMAIN\b/c\ server_name _ localhost ${DOMAIN_NAME};" "${CONFIG}"
DOMAIN_ARRAY=()
if [ "$DOMAIN_NAME" != false ]; then
IFS=',' read -a DOMAIN_ARRAY <<< "$DOMAIN_NAME"
echo "Configuring domain name/s - ${DOMAIN_ARRAY[*]}"
sed -i "/\bYOURDOMAIN\b/c\ server_name _ localhost ${DOMAIN_ARRAY[*]};" "${CONFIG}"
fi

nginx -g 'daemon off;' & sleep 5

if [ "$ENABLE_LETSENCRYPT" = True ] && [ "$DOMAIN_NAME" ] && [ "$USER_EMAIL" ]; then

fullchain_path="/var/log/letsencrypt/live/${DOMAIN_NAME}/fullchain.pem"

certbot certonly -n --webroot --webroot-path /usr/share/nginx/html --no-redirect --agree-tos --email "$USER_EMAIL" -d "$DOMAIN_NAME" --config-dir /var/log/letsencrypt/ --work-dir /var/log/letsencrypt/work --logs-dir /var/log/letsencrypt/log
fullchain_path="/var/log/letsencrypt/live/${DOMAIN_ARRAY[0]}/fullchain.pem"
certbot certonly -n --webroot --webroot-path /usr/share/nginx/html --no-redirect --agree-tos --email "$USER_EMAIL" --expand ${DOMAIN_ARRAY[@]/#/ -d } --config-dir /var/log/letsencrypt/ --work-dir /var/log/letsencrypt/work --logs-dir /var/log/letsencrypt/log

if [ $? -eq 0 ]; then

if [ -f "$fullchain_path" ]; then
sed -i "/\bssl_certificate\b/c\ssl_certificate \/var\/log\/letsencrypt\/live\/${DOMAIN_NAME}\/fullchain.pem;" "${CONFIG}"
sed -i "/\bssl_certificate_key\b/c\ssl_certificate_key \/var\/log\/letsencrypt\/live\/${DOMAIN_NAME}\/privkey.pem;" "${CONFIG}"
sed -i "/\bssl_certificate\b/c\ssl_certificate \/var\/log\/letsencrypt\/live\/${DOMAIN_ARRAY[0]}\/fullchain.pem;" "${CONFIG}"
sed -i "/\bssl_certificate_key\b/c\ssl_certificate_key \/var\/log\/letsencrypt\/live\/${DOMAIN_ARRAY[0]}\/privkey.pem;" "${CONFIG}"
nginx -s reload
echo "Let's Encrypt certificate obtained successfully."
random_minute=$(shuf -i 0-59 -n 1)
Expand Down
9 changes: 5 additions & 4 deletions files/renew.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
#!/bin/sh
#!/bin/bash


fullchain_path="/var/log/letsencrypt/live/${DOMAIN_NAME}/fullchain.pem"
DOMAIN_ARRAY=()
IFS=',' read -a DOMAIN_ARRAY <<< "$DOMAIN_NAME"
fullchain_path="/var/log/letsencrypt/live/${DOMAIN_ARRAY[0]}/fullchain.pem"

if [ "$ENABLE_LETSENCRYPT" = True ] && [ "$DOMAIN_NAME" ] && [ "$USER_EMAIL" ]; then

certbot certonly -n --webroot --webroot-path /usr/share/nginx/html --no-redirect --agree-tos --email "$USER_EMAIL" -d "$DOMAIN_NAME" --config-dir /var/log/letsencrypt/ --work-dir /var/log/letsencrypt/work --logs-dir /var/log/letsencrypt/log
certbot certonly -n --webroot --webroot-path /usr/share/nginx/html --no-redirect --agree-tos --email "$USER_EMAIL" --expand ${DOMAIN_ARRAY[@]/#/ -d } --config-dir /var/log/letsencrypt/ --work-dir /var/log/letsencrypt/work --logs-dir /var/log/letsencrypt/log
if [ $? -eq 0 ]; then
echo "certbot certonly -n... Executed."
if [ -f "$fullchain_path" ]; then
Expand Down