Merge pull request #12 from ds17f/easy-user-config

Allow user configs without custom image
This commit is contained in:
Elliot Saba 2019-11-19 01:57:46 -08:00 committed by GitHub
commit 4cedfe2a4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 31 additions and 8 deletions

View File

@ -11,13 +11,12 @@ This repository was originally forked from `@henridwyer`, many thanks to him for
# Usage # Usage
Use this image with a `Dockerfile` such as: Create a config directory for your custom configs:
```Dockerfile ```
FROM staticfloat/nginx-certbot mkdir conf.d
COPY *.conf /etc/nginx/conf.d/
``` ```
And a `.conf` file such as: And a `.conf` in that directory:
```nginx ```nginx
server { server {
listen 443 ssl; listen 443 ssl;
@ -43,6 +42,8 @@ services:
- 443:443/tcp - 443:443/tcp
environment: environment:
- CERTBOT_EMAIL=owner@company.com - CERTBOT_EMAIL=owner@company.com
volumes:
- ./conf.d:/etc/nginx/user.conf.d :ro
... ...
``` ```

View File

@ -1,2 +0,0 @@
FROM staticfloat/nginx-certbot
COPY *.conf /etc/nginx/conf.d/

View File

@ -2,10 +2,13 @@ version: '3'
services: services:
proxy: proxy:
build: . image: staticfloat/nginx-certbot
restart: always restart: always
environment: environment:
CERTBOT_EMAIL: "your.email@example.com" CERTBOT_EMAIL: "your.email@example.com"
ports: ports:
- "80:80" - "80:80"
- "443:443" - "443:443"
volumes:
- ./conf.d:/etc/nginx/user.conf.d :ro

View File

@ -7,6 +7,9 @@ trap "kill 0" EXIT
# Source in util.sh so we can have our nice tools # Source in util.sh so we can have our nice tools
. $(cd $(dirname $0); pwd)/util.sh . $(cd $(dirname $0); pwd)/util.sh
# first include any user configs if they've been mounted
link_user_configs
# Immediately run auto_enable_configs so that nginx is in a runnable state # Immediately run auto_enable_configs so that nginx is in a runnable state
auto_enable_configs auto_enable_configs

View File

@ -92,3 +92,21 @@ is_renewal_required() {
is_finshed_week_sec=$(( ($one_week_sec - $last_renewal_delta_sec) )) is_finshed_week_sec=$(( ($one_week_sec - $last_renewal_delta_sec) ))
[ $is_finshed_week_sec -lt 0 ] [ $is_finshed_week_sec -lt 0 ]
} }
# symlinks any *.conf files in /etc/nginx/user.conf.d
# to /etc/nginx/conf.d so they are included as configs
# this allows a user to easily mount their own configs
link_user_configs() {
SOURCE_DIR="${1-/etc/nginx/user.conf.d}"
TARGET_DIR="${2-/etc/nginx/conf.d}"
echo "symlinking scripts from ${SOURCE_DIR} to ${TARGET_DIR}"
if [ ! -d "$SOURCE_DIR" ]; then
echo "no ${SOURCE_DIR}, nothing to do."
else
for conf in ${SOURCE_DIR}/*.conf; do
ln -sv "${conf}" "${TARGET_DIR}/$(basename ${conf})"
done
fi
}