Skip to content
This repository has been archived by the owner on May 14, 2020. It is now read-only.

Refactoring ModSecurity CRS Branch v3.3/dev #1627

Merged
merged 1 commit into from
Dec 2, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "documentation/OWASP-CRS-Documentation"]
path = documentation/OWASP-CRS-Documentation
[submodule "docs/OWASP-CRS-Documentation"]
path = docs/OWASP-CRS-Documentation
url = https://github.com/SpiderLabs/OWASP-CRS-Documentation
branch = master
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ jobs:
fast_finish: true
include:
- install:
- pip install -r util/integration/requirements.txt
- pip install -r tests/integration/requirements.txt
before_script:
- git clone https://github.com/CRS-support/secrules_parsing
- pip install -r secrules_parsing/requirements.txt
- python secrules_parsing/secrules_parser.py -c -f rules/*.conf
script:
- py.test -vs util/integration/format_tests.py
- py.test -vs tests/integration/format_tests.py
- &test-common
env: CONFIG=2.9-apache LOGDIR=/var/log/apache2
before_install:
Expand All @@ -48,11 +48,11 @@ jobs:
exit 1
fi
install:
- pip install -r util/regression-tests/requirements.txt
- pip install -r tests/regression/requirements.txt
script:
- |
py.test -vs util/regression-tests/CRS_Tests.py \
--config=$CONFIG --ruledir_recurse=util/regression-tests/tests
py.test -vs tests/regression/CRS_Tests.py \
--config=$CONFIG --ruledir_recurse=tests/regression/tests
- docker rm -f "$TRAVIS_BUILD_ID"
- <<: *test-common
env: CONFIG=3.0-apache LOGDIR=/var/log/apache2
Expand Down
1 change: 1 addition & 0 deletions docs/OWASP-CRS-Documentation
File renamed without changes.
1 change: 0 additions & 1 deletion documentation/OWASP-CRS-Documentation
Submodule OWASP-CRS-Documentation deleted from 6017f2