Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM bfren/nginx:nginx1.20-2.5.2
FROM bfren/nginx:nginx1.20-3.0.3

ARG BF_IMAGE
ARG BF_VERSION
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2021 bfren
Copyright (c) 2020-2022 bfren

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,4 @@ The image contains a handful of useful Nginx configuration 'helper' files, which

## Copyright

> Copyright (c) 2021 [bfren](https://bfren.dev) (unless otherwise stated)
> Copyright (c) 2020-2022 [bfren](https://bfren.dev) (unless otherwise stated)
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.3
3.0.0
2 changes: 1 addition & 1 deletion VERSION_MAJOR
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2
3
2 changes: 1 addition & 1 deletion VERSION_MINOR
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6
3.0
4 changes: 4 additions & 0 deletions overlay/etc/bf/ch.d/20-proxy
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/etc/nginx/sites www:www 0640 0750
/etc/ssl/certs www:www 0640 0750
/sites www:www 0640 0750
/ssl www:www 0640 0750
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash

set -euo pipefail
export BF_E=`basename ${0}`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash

set -euo pipefail
export BF_E=`basename ${0}`
Expand Down
5 changes: 0 additions & 5 deletions overlay/etc/fix-attrs.d/20-proxy

This file was deleted.

2 changes: 1 addition & 1 deletion overlay/etc/periodic/daily/update-certs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash

set -euo pipefail
export BF_E=`basename ${0}`
Expand Down
4 changes: 2 additions & 2 deletions overlay/tmp/install
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ bf-done
# Cleanup.
#======================================================================================================================

bf-debug "Cleaning up Nginx sites definitions."
bf-echo "Cleaning up Nginx sites definitions."
rm -rf /etc/nginx/sites
bf-done

Expand All @@ -29,7 +29,7 @@ bf-done
# Create and link Nginx directories.
#======================================================================================================================

bf-debug "Creating and linking Nginx directories."
bf-echo "Creating and linking Nginx directories."

mkdir /sites
ln -s /sites /etc/nginx/sites
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash

set -euo pipefail
export BF_E=`basename ${0}`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash

set -euo pipefail
export BF_E=`basename ${0}`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash

set -euo pipefail
export BF_E=`basename ${0}`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash

set -euo pipefail
export BF_E=`basename ${0}`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash

set -euo pipefail
export BF_E=`basename ${0}`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash

set -euo pipefail
export BF_E=`basename ${0}`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash

set -euo pipefail
export BF_E=`basename ${0}`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash

set -euo pipefail
export BF_E=`basename ${0}`
Expand Down
2 changes: 1 addition & 1 deletion overlay/usr/lib/bf/inc/proxy-check.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash


#======================================================================================================================
Expand Down
2 changes: 1 addition & 1 deletion overlay/usr/lib/bf/inc/proxy-load-conf.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash


#======================================================================================================================
Expand Down
2 changes: 1 addition & 1 deletion overlay/usr/lib/bf/inc/proxy-replace.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash


#======================================================================================================================
Expand Down
2 changes: 1 addition & 1 deletion overlay/usr/lib/bf/inc/proxy-setup-global.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash


#======================================================================================================================
Expand Down
2 changes: 1 addition & 1 deletion overlay/usr/lib/bf/inc/proxy-setup-nginx.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash


#======================================================================================================================
Expand Down
2 changes: 1 addition & 1 deletion overlay/usr/lib/bf/inc/proxy-setup-ssl.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash


#======================================================================================================================
Expand Down
2 changes: 1 addition & 1 deletion overlay/usr/lib/bf/proxy/init
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash

export BF_E=`basename ${0}`

Expand Down
2 changes: 1 addition & 1 deletion overlay/usr/lib/bf/proxy/request
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash

export BF_E=`basename ${0}`

Expand Down
2 changes: 1 addition & 1 deletion overlay/usr/lib/bf/proxy/update
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash

export BF_E=`basename ${0}`

Expand Down