Skip to content

v3.1.0 #74

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

Merged
merged 3 commits into from
Mar 3, 2022
Merged

v3.1.0 #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c2f69b
Bumping version to 3.1.0
bfren Mar 2, 2022
b52cbc6
Allowing individual SSL certificate to be regenerated
bfren Mar 2, 2022
5199b53
Adding custom configuration support to proxy conf
bfren Mar 3, 2022
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 VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.4
3.1.0
2 changes: 1 addition & 1 deletion VERSION_MINOR
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0
3.1
3 changes: 3 additions & 0 deletions overlay/etc/bf/templates/nginx-proxy.conf.esh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ server {
# include secure headers
include helpers/proxy-secure-headers.conf;

# include custom configuration
include <%= "${CUSTOM_CONF}/*.conf" %>;

# include standard helpers
include helpers/nginx-ignore-favicon.conf;
include helpers/nginx-static-files.conf;
Expand Down
29 changes: 25 additions & 4 deletions overlay/usr/bin/bf/ssl-regenerate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,33 @@ export BF_E=`basename ${0}`


#======================================================================================================================
# Delete SSL files and reinitialise.
# Remove specified domain (or all domains).
#======================================================================================================================

bf-echo "Removing SSL certificates and configuration..."
bf-rmrf "${PROXY_SSL_CERTS}/*"
bf-done
if [ -n "${1-}" ] ; then

DOMAIN=${1}
[[ ! -d "${PROXY_SSL_CERTS}/${DOMAIN}" ]] && bf-error "Domain ${DOMAIN} has not been setup for SSL."

bf-echo "Removing SSL certificates and configuration for ${DOMAIN}..."
rm -r \
"${PROXY_SSL_CERTS}/${DOMAIN}" \
"${PROXY_SSL_CERTS}/${DOMAIN}.crt" \
"${PROXY_SSL_CERTS}/${DOMAIN}.key"
bf-done

else

bf-echo "Removing SSL certificates and configuration..."
bf-rmrf "${PROXY_SSL_CERTS}/*"
bf-done

fi


#======================================================================================================================
# Reinitialise SSL.
#======================================================================================================================

cd ${PROXY_LIB}
s6-setuidgid www ./init && ./request
Expand Down