summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-13 15:07:29 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-13 15:07:29 +0000
commit3318518149062e5d17105f2170bd7bd9647af415 (patch)
treea2e49b8fea4543717ca006e9d06bdc032d5d4281 /vendor
parent4e516dbff9767a35677fdc4a6e39005b4b564376 (diff)
downloadgitlab-ce-3318518149062e5d17105f2170bd7bd9647af415.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'vendor')
-rw-r--r--vendor/ingress/modsecurity.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/vendor/ingress/modsecurity.conf b/vendor/ingress/modsecurity.conf
index ee702a50ed5..3a6b5cee2e5 100644
--- a/vendor/ingress/modsecurity.conf
+++ b/vendor/ingress/modsecurity.conf
@@ -236,7 +236,8 @@ SecAuditLogParts ABIJDEFHZ
# assumes that you will use the audit log only ocassionally.
#
# SecAuditLogType Serial
-SecAuditLog /var/log/modsec_audit.log
+SecAuditLogFormat JSON
+SecAuditLog /var/log/modsec/audit.log
# Specify the path for concurrent audit logging.
#SecAuditLogStorageDir /opt/modsecurity/var/audit/