Skip to content

Commit

Permalink
remove unused files
Browse files Browse the repository at this point in the history
  • Loading branch information
woutslakhorst committed Nov 12, 2024
1 parent 57d1f62 commit e9f3eaa
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 30 deletions.
4 changes: 1 addition & 3 deletions e2e-tests/clustering/memcached/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ services:
- "../../tls-certs/nodeA-certificate.pem:/etc/nginx/ssl/server.pem:ro"
- "../../tls-certs/nodeA-certificate.pem:/etc/nginx/ssl/key.pem:ro"
- "../../tls-certs/truststore.pem:/etc/nginx/ssl/truststore.pem:ro"
- "./node-A/html:/etc/nginx/html:ro"
- "../../scripts/oauth2.js:/etc/nginx/oauth2.js:ro"
nodeB-backend:
image: "${IMAGE_NODE_B:-nutsfoundation/nuts-node:master}"
Expand All @@ -58,5 +57,4 @@ services:
- "../../shared_config/nodeB-http-nginx.conf:/etc/nginx/conf.d/nuts-http.conf:ro"
- "../../tls-certs/nodeB-certificate.pem:/etc/nginx/ssl/server.pem:ro"
- "../../tls-certs/nodeB-certificate.pem:/etc/nginx/ssl/key.pem:ro"
- "../../tls-certs/truststore.pem:/etc/nginx/ssl/truststore.pem:ro"
- "./node-B/html:/etc/nginx/html:ro"
- "../../tls-certs/truststore.pem:/etc/nginx/ssl/truststore.pem:ro"
1 change: 0 additions & 1 deletion e2e-tests/clustering/memcached/node-A/html/ping

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion e2e-tests/clustering/memcached/node-B/html/ping

This file was deleted.

4 changes: 1 addition & 3 deletions e2e-tests/clustering/redis/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ services:
- "../../tls-certs/nodeA-certificate.pem:/etc/nginx/ssl/server.pem:ro"
- "../../tls-certs/nodeA-certificate.pem:/etc/nginx/ssl/key.pem:ro"
- "../../tls-certs/truststore.pem:/etc/nginx/ssl/truststore.pem:ro"
- "./node-A/html:/etc/nginx/html:ro"
- "../../scripts/oauth2.js:/etc/nginx/oauth2.js:ro"
nodeB-backend:
image: "${IMAGE_NODE_B:-nutsfoundation/nuts-node:master}"
Expand All @@ -92,5 +91,4 @@ services:
- "../../shared_config/nodeB-http-nginx.conf:/etc/nginx/conf.d/nuts-http.conf:ro"
- "../../tls-certs/nodeB-certificate.pem:/etc/nginx/ssl/server.pem:ro"
- "../../tls-certs/nodeB-certificate.pem:/etc/nginx/ssl/key.pem:ro"
- "../../tls-certs/truststore.pem:/etc/nginx/ssl/truststore.pem:ro"
- "./node-B/html:/etc/nginx/html:ro"
- "../../tls-certs/truststore.pem:/etc/nginx/ssl/truststore.pem:ro"
1 change: 0 additions & 1 deletion e2e-tests/clustering/redis/node-A/html/ping

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion e2e-tests/clustering/redis/node-B/html/ping

This file was deleted.

12 changes: 8 additions & 4 deletions e2e-tests/clustering/redis/sentinel/A/sentinel.conf
Original file line number Diff line number Diff line change
Expand Up @@ -345,13 +345,17 @@ sentinel config-epoch mymaster 0
sentinel leader-epoch mymaster 0
sentinel current-epoch 0

sentinel known-replica mymaster 172.16.4.7 6379

sentinel known-replica mymaster 172.16.4.10 6379

sentinel known-sentinel mymaster 172.16.4.8 26379 438e26b6ac8c551d3b53862a7a830378a3325ed3
sentinel known-replica mymaster 172.16.4.11 6379

sentinel known-sentinel mymaster 172.16.4.9 26379 438e26b6ac8c551d3b53862a7a830378a3325ed3

sentinel known-sentinel mymaster 172.16.4.10 26379 f2b8569475e78470ea68ac3213020b849394f6bd

sentinel known-sentinel mymaster 172.16.4.9 26379 a82fa5573e29b3ae905fc761bd1a0dcb574ec565

sentinel known-sentinel mymaster 172.16.4.7 26379 f2b8569475e78470ea68ac3213020b849394f6bd
sentinel known-replica mymaster 172.16.4.8 6379

sentinel known-replica mymaster 172.16.4.7 6379

10 changes: 6 additions & 4 deletions e2e-tests/clustering/redis/sentinel/B/sentinel.conf
Original file line number Diff line number Diff line change
Expand Up @@ -347,11 +347,13 @@ sentinel current-epoch 0

sentinel known-replica mymaster 172.16.4.10 6379

sentinel known-replica mymaster 172.16.4.7 6379
sentinel known-replica mymaster 172.16.4.8 6379

sentinel known-sentinel mymaster 172.16.4.7 26379 f2b8569475e78470ea68ac3213020b849394f6bd
sentinel known-sentinel mymaster 172.16.4.10 26379 f2b8569475e78470ea68ac3213020b849394f6bd

sentinel known-sentinel mymaster 172.16.4.9 26379 a82fa5573e29b3ae905fc761bd1a0dcb574ec565
sentinel known-sentinel mymaster 172.16.4.11 26379 a82fa5573e29b3ae905fc761bd1a0dcb574ec565

sentinel known-replica mymaster 172.16.4.8 6379
sentinel known-replica mymaster 172.16.4.7 6379

sentinel known-sentinel mymaster 172.16.4.9 26379 438e26b6ac8c551d3b53862a7a830378a3325ed3

10 changes: 6 additions & 4 deletions e2e-tests/clustering/redis/sentinel/C/sentinel.conf
Original file line number Diff line number Diff line change
Expand Up @@ -345,11 +345,13 @@ sentinel config-epoch mymaster 0
sentinel leader-epoch mymaster 0
sentinel current-epoch 0

sentinel known-replica mymaster 172.16.4.7 6379
sentinel known-replica mymaster 172.16.4.8 6379

sentinel known-sentinel mymaster 172.16.4.8 26379 438e26b6ac8c551d3b53862a7a830378a3325ed3
sentinel known-sentinel mymaster 172.16.4.9 26379 f2b8569475e78470ea68ac3213020b849394f6bd

sentinel known-sentinel mymaster 172.16.4.9 26379 a82fa5573e29b3ae905fc761bd1a0dcb574ec565
sentinel known-sentinel mymaster 172.16.4.9 26379 438e26b6ac8c551d3b53862a7a830378a3325ed3

sentinel known-replica mymaster 172.16.4.8 6379
sentinel known-replica mymaster 172.16.4.7 6379

sentinel known-sentinel mymaster 172.16.4.11 26379 a82fa5573e29b3ae905fc761bd1a0dcb574ec565

0 comments on commit e9f3eaa

Please sign in to comment.