Skip to content

Commit 456bb89

Browse files
authored
Merge pull request #39 from crowdsecurity/ipv6
add Ipv6 support
2 parents 52a7202 + 84e18c6 commit 456bb89

14 files changed

+338
-276
lines changed

.github/workflows/tests.yml

-4
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ jobs:
4848
- name: Add a machine to pilot crowdsec state
4949
run: docker exec crowdsec cscli machines add PhpUnitTestMachine --password PhpUnitTestMachinePassword
5050

51-
- name: Install libmemcached
52-
if: matrix.php == '8.0' # required only for php 8 as mentioned here: https://github.com/shivammathur/setup-php/issues/354
53-
run: sudo apt-get install libmemcached-dev -y
54-
5551
- name: Setup PHP
5652
uses: shivammathur/setup-php@v2
5753
with:

composer.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,13 @@
3333
"symfony/config": "^5.2",
3434
"symfony/cache": "^5.2",
3535
"monolog/monolog": "^2.1",
36-
"gregwar/captcha": "^1.1"
36+
"gregwar/captcha": "^1.1",
37+
"mlocati/ip-lib": "^1.14"
3738
},
3839
"require-dev": {
3940
"bramus/monolog-colored-line-formatter": "^3.0",
4041
"symfony/var-dumper": "^5.2",
4142
"phpunit/phpunit": "8.5.13",
4243
"clean/phpdoc-md": "^0.19.1"
4344
}
44-
}
45+
}

composer.lock

+73-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/contribute.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ git branch -m <new-name>
8080
git push origin :<old-name> && git push origin <new-name>
8181

8282
# Create PR
83-
gh pr create --fill
83+
gh pr create --fill --web
8484
```
8585

8686
> Note: after the merge, don't forget to delete to branch.

scripts/setup-local-crowdsec.sh

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
#!/bin/sh
22

33
# Delete existing LAPI database.
4-
[ -e ../var/docker-data/crowdsec.db ] && rm ../var/docker-data/crowdsec.db
4+
[ -e ./var/docker-data/crowdsec.db ] && rm ./var/docker-data/crowdsec.db
55

66
# Start containers.
77
docker-compose up --force-recreate -d crowdsec
88
docker-compose up --remove-orphans -d redis memcached
99

1010
# Create a bouncer with cscli and copy expose generated key.
11-
docker-compose exec crowdsec /usr/local/bin/cscli bouncers add bouncer-php-library -o raw > ../.bouncer-key
11+
docker-compose exec crowdsec /usr/local/bin/cscli bouncers add bouncer-php-library -o raw > ./.bouncer-key
1212

1313
# Create a watcher with cscli.
14-
docker-compose exec crowdsec cscli machines add PhpUnitTestMachine --password PhpUnitTestMachinePassword > /dev/null 2>&1
14+
docker-compose exec crowdsec cscli machines add PhpUnitTestMachine --password PhpUnitTestMachinePassword > /dev/null 2>&1
15+
16+
# Ensure composer deps are presents
17+
docker-compose run app composer install

0 commit comments

Comments
 (0)