Skip to content
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

provide a way to disable SSL completely #182

Closed
wants to merge 10 commits into from
Closed

provide a way to disable SSL completely #182

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1314db5
provide a way to disable SSL completely (common scenario when SSL is …
aiqui Dec 16, 2020
c63164e
Change to more generic email address
yanokwa Dec 16, 2020
65c1785
Update Enketo to 2.5.3 and pyxform-http to 1.3.3
lognaturel Dec 17, 2020
6e57b17
service: plumb through the sysadmin email, for backup failure alerting.
issa-tseng Dec 11, 2020
4dc1a1f
Update submodules for v1.1
matthew-white Dec 23, 2020
6981032
Update Enketo to 2.5.6
lognaturel Dec 23, 2020
ebe377b
Update news for v1.1
matthew-white Dec 23, 2020
3b2e8c9
Update server for v1.1.1
matthew-white Dec 26, 2020
1ffafdc
Update news for v1.1.1
matthew-white Dec 28, 2020
2acaa85
merge of master and recommendations added from Helene Martin (@lognat…
aiqui Jan 10, 2021
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
4 changes: 3 additions & 1 deletion .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
SSL_TYPE=selfsign|letsencrypt|customssl
SSL_TYPE=selfsign|letsencrypt|customssl|none
aiqui marked this conversation as resolved.
Show resolved Hide resolved
DOMAIN=local|your.domain.com
SYSADMIN_EMAIL=administrator@email.com
OPEN_PORT=80
aiqui marked this conversation as resolved.
Show resolved Hide resolved
SSL_PORT=443
4 changes: 2 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ services:
- DOMAIN=${DOMAIN}
- CERTBOT_EMAIL=${SYSADMIN_EMAIL}
ports:
- "80:80"
- "443:443"
- "${OPEN_PORT}:80"
- "${SSL_PORT}:443"
healthcheck:
test: [ "CMD-SHELL", "nc -z localhost 443 || exit 1" ]
restart: always
Expand Down
8 changes: 7 additions & 1 deletion files/nginx/odk-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
DHPATH=/etc/dh/nginx.pem
if [ ! -e "$DHPATH" ]
if [ ! -e "$DHPATH" ] && [ "$SSL_TYPE" != "none" ]
then
echo "diffie hellman private key does not exist; creating.."
openssl dhparam -out "$DHPATH" 2048
Expand All @@ -25,6 +25,12 @@ if [ "$SSL_TYPE" = "letsencrypt" ]
then
echo "starting nginx with certbot.."
/bin/bash /scripts/entrypoint.sh
elif [ "$SSL_TYPE" = "none" ]
then
perl -i -ne 's/listen 443.*/listen 80;/; print if ! /ssl_/' /etc/nginx/conf.d/odk.conf
rm -f /etc/nginx/conf.d/certbot.conf
echo "starting open nginx (no SSL) without certbot.."
nginx -g "daemon off;"
else
echo "starting nginx without certbot.."
nginx -g "daemon off;"
Expand Down