Skip to content

Commit

Permalink
Repo-sync
Browse files Browse the repository at this point in the history
  • Loading branch information
GitHub Workflow committed Nov 11, 2024
1 parent 485697b commit 16d8a98
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 28 deletions.
4 changes: 2 additions & 2 deletions Containers/apache/supervisord.conf
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ logfile_backups=10
loglevel=error

[program:apache]
# stdout_logfile=/dev/stdout
# stdout_logfile_maxbytes=0
# Stdout logging is disabled as otherwise the logs are spammed
stdout_logfile=NONE
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
command=apachectl -DFOREGROUND
Expand Down
4 changes: 3 additions & 1 deletion Containers/borgbackup/backupscript.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@ if [ -n "$BORG_REMOTE_REPO" ] && ! [ -f "$BORGBACKUP_KEY" ]; then
ssh-keygen -f "$BORGBACKUP_KEY" -N ""
echo "You should configure the remote to accept this public key"
fi
echo "Your public ssh key for borgbackup is: $(cat "$BORGBACKUP_KEY.pub")"
if [ -n "$BORG_REMOTE_REPO" ] && [ -f "$BORGBACKUP_KEY.pub" ]; then
echo "Your public ssh key for borgbackup is: $(cat "$BORGBACKUP_KEY.pub")"
fi

# Do the backup
if [ "$BORG_MODE" = backup ]; then
Expand Down
2 changes: 1 addition & 1 deletion Containers/clamav/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:latest
# Probably from this file: https://github.com/Cisco-Talos/clamav-docker/blob/main/clamav/1.3/alpine/Dockerfile
FROM clamav/clamav:1.4.1-11
FROM clamav/clamav:1.4.1-12

COPY clamav.conf /clamav.conf
COPY --chmod=775 start.script /start.script
Expand Down
2 changes: 1 addition & 1 deletion Containers/docker-socket-proxy/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:latest
FROM haproxy:3.0.5-alpine
FROM haproxy:3.0.6-alpine

# hadolint ignore=DL3002
USER root
Expand Down
14 changes: 6 additions & 8 deletions Containers/mastercontainer/supervisord.conf
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ loglevel=error
user=root

[program:php-fpm]
# stdout_logfile=/dev/stdout
# stdout_logfile_maxbytes=0
# Stdout logging is disabled as otherwise the logs are spammed
stdout_logfile=NONE
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
command=php-fpm
user=root

[program:apache]
# stdout_logfile=/dev/stdout
# stdout_logfile_maxbytes=0
# Stdout logging is disabled as otherwise the logs are spammed
stdout_logfile=NONE
stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0
command=httpd -DFOREGROUND
Expand Down Expand Up @@ -58,9 +58,7 @@ user=root

[program:domain-validator]
# Logging is disabled as otherwise all attempts will be logged which spams the logs
# stdout_logfile=/dev/stdout
# stdout_logfile_maxbytes=0
# stderr_logfile=/dev/stderr
# stderr_logfile_maxbytes=0
stdout_logfile=NONE
stderr_logfile=NONE
command=php -S 127.0.0.1:9876 /var/www/docker-aio/php/domain-validator.php
user=www-data
2 changes: 1 addition & 1 deletion Containers/nextcloud/notify-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ mapfile -t NC_USERS <<< "$NC_USERS"
for user in "${NC_USERS[@]}"
do
echo "Posting '$SUBJECT' to: $user"
"${COMMAND[@]}" notification:generate "$user" "$NC_DOMAIN: $SUBJECT" -l "$MESSAGE"
"${COMMAND[@]}" notification:generate "$user" "$NC_DOMAIN: $SUBJECT" -l "$MESSAGE" --object-type='update' --object-id="$SUBJECT"
done

echo "Done!"
Expand Down
2 changes: 1 addition & 1 deletion Containers/nextcloud/notify.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ done
for admin in "${NC_ADMIN_USER[@]}"
do
echo "Posting '$SUBJECT' to: $admin"
"${COMMAND[@]}" notification:generate "$admin" "$NC_DOMAIN: $SUBJECT" -l "$MESSAGE"
"${COMMAND[@]}" notification:generate "$admin" "$NC_DOMAIN: $SUBJECT" -l "$MESSAGE" --object-type='update' --object-id="$SUBJECT"
done

echo "Done!"
Expand Down
26 changes: 13 additions & 13 deletions php/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 16d8a98

Please sign in to comment.