Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed wiki links #48

Merged
merged 7 commits into from
Aug 10, 2023
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 README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ After that, there are two ways of running BuffaLogs, depending on your system co

![buffalogs_dashboard_screenshot](https://user-images.githubusercontent.com/33703137/220879987-b6453e9d-0129-45c1-bc26-0542005e8730.png)

*For further examples: [Wiki - Example](https://github.com/certego/BuffaLogs/wiki/2.-Example)*
*For further examples: [Wiki - Example](https://github.com/certego/BuffaLogs/wiki/3.-Example)*

## Logs Structure

Expand Down Expand Up @@ -119,7 +119,7 @@ For a basic analysis to detect only impossible travel logins, the *user_agent* f
## BuffaLogs Architecture
![Buffalogs_Architecture](https://user-images.githubusercontent.com/33703137/220896332-4fe08f32-1879-4150-bd5d-9df9dc21a7a7.jpg)

*For further details: [Wiki - Architecture](https://github.com/certego/BuffaLogs/wiki/3.-Architecture)*
*For further details: [Wiki - Architecture](https://github.com/certego/BuffaLogs/wiki/4.-Architecture)*

## REST APIs

Expand Down
Binary file added buffalogs/celerybeat-schedule
Binary file not shown.
Empty file modified buffalogs/run_beat.sh
100644 → 100755
Empty file.
8 changes: 4 additions & 4 deletions docker-compose.override.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ services:
buffalogs:
volumes:
- ./buffalogs:/opt/certego/buffalogs
celery:
buffalogs_celery:
volumes:
- ./buffalogs:/opt/certego/buffalogs

celery_beat:
buffalogs_celery_beat:
volumes:
- ./buffalogs:/opt/certego/buffalogs

postgres:
buffalogs_postgres:
ports:
- "127.0.0.1:5432:5432"

rabbitmq:
buffalogs_rabbitmq:
ports:
- "127.0.0.1:5672:5672"
- "127.0.0.1:15672:15672"
54 changes: 27 additions & 27 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,28 @@ version: '3.2'

services:

postgres:
buffalogs_postgres:
container_name: buffalogs_postgres
image: postgres:15.1-alpine
env_file:
- config/buffalogs/buffalogs.env
volumes:
- postgres_data:/var/lib/postgresql/data
- buffalogs_postgres_data:/var/lib/postgresql/data
expose:
- "5432"

nginx:
container_name: nginx
buffalogs_nginx:
container_name: buffalogs_nginx
image: nginx:mainline-alpine
hostname: nginx
depends_on:
- buffalogs
volumes:
- ./config/nginx/conf.d:/etc/nginx/conf.d:ro
# - ./config/nginx/certs:/etc/nginx/certs:ro
- django_static:/var/www:ro
- nginx_sockets:/var/run/nginx-sockets
- nginx_logs:/var/log/nginx:rw
- buffalogs_django_static:/var/www:ro
- buffalogs_nginx_sockets:/var/run/nginx-sockets
- buffalogs_nginx_logs:/var/log/nginx:rw
ports:
- "80:80"

Expand All @@ -37,28 +37,28 @@ services:
env_file:
- config/buffalogs/buffalogs.env
volumes:
- django_static:/var/www
- nginx_sockets:/var/run/nginx-sockets
- buffalogs_django_static:/var/www
- buffalogs_nginx_sockets:/var/run/nginx-sockets
depends_on:
- postgres
- rabbitmq
- buffalogs_postgres
- buffalogs_rabbitmq


rabbitmq:
container_name: rabbitmq
buffalogs_rabbitmq:
container_name: buffalogs_rabbitmq
image: rabbitmq:3.11-management-alpine
hostname: rabbitmq
volumes:
- ./config/rabbitmq:/etc/rabbitmq:ro
- rabbitmq_data:/var/lib/rabbitmq
- buffalogs_rabbitmq_data:/var/lib/rabbitmq
expose:
- "5672"
- "15672"
healthcheck:
test: rabbitmqctl status

celery:
container_name: celery
buffalogs_celery:
container_name: buffalogs_celery
image: buffalogs:latest
hostname: celery
build:
Expand All @@ -71,11 +71,11 @@ services:
volumes:
- ./config:/opt/certego/config:ro
depends_on:
- postgres
- rabbitmq
- buffalogs_postgres
- buffalogs_rabbitmq

celery_beat:
container_name: celery_beat
buffalogs_celery_beat:
container_name: buffalogs_celery_beat
build:
context: .
dockerfile: build/Dockerfile
Expand All @@ -88,18 +88,18 @@ services:
volumes:
- ./config:/opt/certego/config:ro
depends_on:
- postgres
- rabbitmq
- buffalogs_postgres
- buffalogs_rabbitmq

volumes:

postgres_data:
buffalogs_postgres_data:
driver: local
nginx_sockets:
buffalogs_nginx_sockets:
driver: local
django_static:
buffalogs_django_static:
driver: local
nginx_logs:
buffalogs_nginx_logs:
driver: local
rabbitmq_data:
buffalogs_rabbitmq_data:
driver: local
Loading