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

chore: ensure fail2ban stays disabled when FAIL2BAN_DISABLED is set #796

Merged
merged 2 commits into from
Nov 20, 2023
Merged

chore: ensure fail2ban stays disabled when FAIL2BAN_DISABLED is set #796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c67d653
chore: ensure fail2ban stays disabled when FAIL2BAN_DISABLED is set
bmpandrade Nov 17, 2023
068fd21
chore: update docker aio entrypoint with extra validation on env vars…
bmpandrade Nov 20, 2023
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 docker/all-in-one/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ COPY --chown=postgres:postgres docker/all-in-one/etc/postgresql.schema.sql /etc/
# Customizations for postgres_exporter
COPY --chown=postgres:postgres docker/all-in-one/opt/postgres_exporter/queries.yml /opt/postgres_exporter/queries.yml

# Customizations for fail2ban
COPY docker/all-in-one/etc/fail2ban/filter.d /etc/fail2ban/filter.d/
COPY docker/all-in-one/etc/fail2ban/jail.d /etc/fail2ban/jail.d/

Expand Down
19 changes: 12 additions & 7 deletions docker/all-in-one/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,21 +227,26 @@ find /etc/supervisor/ -type d -exec chmod 0770 {} +
find /etc/supervisor/ -type f -exec chmod 0660 {} +

# Start services in the background
if [ -z "${POSTGRES_ONLY:-}" ]; then
sed -i "s| # - postgrest| - postgrest|g" /etc/adminapi/adminapi.yaml
sed -i "s|files = db-only/\*.conf|files = services/\*.conf db-only/\*.conf|g" $SUPERVISOR_CONF
configure_services
else
if [ "${POSTGRES_ONLY:-}" == "true" ]; then
sed -i "s| - postgrest| # - postgrest|g" /etc/adminapi/adminapi.yaml
sed -i "s|files = services/\*.conf db-only/\*.conf|files = db-only/\*.conf|g" $SUPERVISOR_CONF
/init/configure-adminapi.sh
else
sed -i "s| # - postgrest| - postgrest|g" /etc/adminapi/adminapi.yaml
sed -i "s|files = db-only/\*.conf|files = services/\*.conf db-only/\*.conf|g" $SUPERVISOR_CONF
configure_services
fi

if [ "${AUTOSHUTDOWN_ENABLED:-}" ]; then
if [ "${AUTOSHUTDOWN_ENABLED:-}" == "true" ]; then
sed -i "s/autostart=.*/autostart=true/" /etc/supervisor/db-only/supa-shutdown.conf
fi

if [ "${PLATFORM_DEPLOYMENT:-}" ]; then
if [ "${FAIL2BAN_DISABLED:-}" == "true" ]; then
sed -i "s/autostart=.*/autostart=false/" /etc/supervisor/services/fail2ban.conf
sed -i "s/autorestart=.*/autorestart=false/" /etc/supervisor/services/fail2ban.conf
fi

if [ "${PLATFORM_DEPLOYMENT:-}" == "true" ]; then
enable_swap
create_lsn_checkpoint_file
fi
Expand Down