-
Notifications
You must be signed in to change notification settings - Fork 111
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Make v3 standard operation * Added compose extends for aws logging * Reorganise compose files * Add missing file
- Loading branch information
Showing
6 changed files
with
196 additions
and
103 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
version: '3' | ||
services: | ||
redis_common: | ||
restart: always | ||
image: redis:7.0.10 | ||
volumes: | ||
- ./data:/data/ | ||
container_name: redis | ||
command: redis-server --appendonly yes --protected-mode no --save 60 1 | ||
frontend_common: | ||
restart: always | ||
image: thinkst/canarytokens | ||
build: ./canarytokens | ||
ports: | ||
- "8082:8082" | ||
env_file: | ||
- frontend.env | ||
volumes: | ||
- ./frontend.env:/srv/frontend/frontend.env:ro | ||
- ./switchboard.env:/srv/switchboard/switchboard.env:ro | ||
- ./uploads:/uploads/ | ||
- log-volume:/logs | ||
container_name: frontend | ||
command: bash -c "cd frontend; poetry run python -m uvicorn app:app --host 0.0.0.0 --port 8082" | ||
switchboard_common: | ||
restart: always | ||
image: thinkst/canarytokens | ||
build: ./canarytokens | ||
ports: | ||
- "25:2500" | ||
- "3306:3306" | ||
- "53:5354" | ||
- "53:5354/udp" | ||
- "6443:6443" | ||
- "8083:8083" | ||
- "51820:51820/udp" | ||
env_file: | ||
- switchboard.env | ||
volumes: | ||
- ./frontend.env:/srv/frontend/frontend.env:ro | ||
- ./switchboard.env:/srv/switchboard/switchboard.env:ro | ||
- ./uploads:/uploads/ | ||
- log-volume:/logs | ||
container_name: switchboard | ||
command: bash -c "cd switchboard; rm -f switchboard.pid; poetry run twistd -noy switchboard.tac --pidfile=switchboard.pid" | ||
nginx_common_certbot: | ||
restart: always | ||
image: thinkst/certbot-nginx | ||
build: ./certbot-nginx | ||
ports: | ||
- "80:80" | ||
- "443:443" | ||
depends_on: | ||
- "frontend" | ||
- "switchboard" | ||
container_name: nginx | ||
env_file: | ||
- certbot.env | ||
volumes: | ||
- /etc/letsencrypt/:/etc/letsencrypt/ | ||
- ./nginx/conf.d:/etc/nginx/conf.d/ | ||
nginx_common: | ||
restart: always | ||
image: thinkst/canarytokens_nginx | ||
build: ./nginx | ||
ports: | ||
- "80:80" | ||
depends_on: | ||
- "frontend" | ||
- "switchboard" | ||
volumes: | ||
- ./nginx/conf.d:/etc/nginx/conf.d/ | ||
container_name: nginx | ||
command: /usr/sbin/nginx -c /etc/nginx/nginx.conf -g "daemon off;" | ||
volumes: | ||
log-volume: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
version: '3' | ||
services: | ||
redis: | ||
extends: | ||
file: common-services.yml | ||
service: redis_common | ||
logging: | ||
driver: awslogs | ||
options: | ||
awslogs-region: eu-west-1 | ||
awslogs-group: canarytokens-dev | ||
awslogs-stream: redis | ||
frontend: | ||
extends: | ||
file: common-services.yml | ||
service: frontend_common | ||
container_name: frontend | ||
logging: | ||
driver: awslogs | ||
options: | ||
awslogs-region: eu-west-1 | ||
awslogs-group: canarytokens-dev | ||
awslogs-stream: frontend | ||
switchboard: | ||
extends: | ||
file: common-services.yml | ||
service: switchboard_common | ||
container_name: switchboard | ||
logging: | ||
driver: awslogs | ||
options: | ||
awslogs-region: eu-west-1 | ||
awslogs-group: canarytokens-dev | ||
awslogs-stream: switchboard | ||
nginx: | ||
extends: | ||
file: common-services.yml | ||
service: nginx_common_certbot | ||
volumes: | ||
- ./nginx/conf.d:/etc/nginx/conf.d/ | ||
logging: | ||
driver: awslogs | ||
options: | ||
awslogs-region: eu-west-1 | ||
awslogs-group: canarytokens-dev | ||
awslogs-stream: nginx | ||
volumes: | ||
log-volume: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
version: '3' | ||
services: | ||
redis: | ||
extends: | ||
file: common-services.yml | ||
service: redis_common | ||
logging: | ||
driver: awslogs | ||
options: | ||
awslogs-region: eu-west-1 | ||
awslogs-group: canarytokens-dev | ||
awslogs-stream: redis | ||
frontend: | ||
extends: | ||
file: common-services.yml | ||
service: frontend_common | ||
container_name: frontend | ||
logging: | ||
driver: awslogs | ||
options: | ||
awslogs-region: eu-west-1 | ||
awslogs-group: canarytokens-dev | ||
awslogs-stream: frontend | ||
switchboard: | ||
extends: | ||
file: common-services.yml | ||
service: switchboard_common | ||
container_name: switchboard | ||
logging: | ||
driver: awslogs | ||
options: | ||
awslogs-region: eu-west-1 | ||
awslogs-group: canarytokens-dev | ||
awslogs-stream: switchboard | ||
nginx: | ||
extends: | ||
file: common-services.yml | ||
service: nginx_common | ||
logging: | ||
driver: awslogs | ||
options: | ||
awslogs-region: eu-west-1 | ||
awslogs-group: canarytokens-dev | ||
awslogs-stream: nginx | ||
volumes: | ||
log-volume: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,63 +1,22 @@ | ||
version: '3' | ||
services: | ||
redis: | ||
restart: always | ||
image: redis:7.0.10 | ||
volumes: | ||
- ./data:/data/ | ||
container_name: redis | ||
command: redis-server --appendonly yes --protected-mode no --save 60 1 | ||
extends: | ||
file: common-services.yml | ||
service: redis_common | ||
frontend: | ||
restart: always | ||
image: thinkst/canarytokens | ||
build: ./canarytokens | ||
ports: | ||
- "8082:8082" | ||
env_file: | ||
- frontend.env | ||
volumes: | ||
- ./frontend.env:/srv/frontend/frontend.env:ro | ||
- ./switchboard.env:/srv/switchboard/switchboard.env:ro | ||
- ./uploads:/uploads/ | ||
- log-volume:/logs | ||
extends: | ||
file: common-services.yml | ||
service: frontend_common | ||
container_name: frontend | ||
command: bash -c "cd frontend; poetry run python -m uvicorn app:app --host 0.0.0.0 --port 8082" | ||
switchboard: | ||
restart: always | ||
image: thinkst/canarytokens | ||
build: ./canarytokens | ||
ports: | ||
- "25:2500" | ||
- "3306:3306" | ||
- "53:5354" | ||
- "53:5354/udp" | ||
- "6443:6443" | ||
- "8083:8083" | ||
- "51820:51820/udp" | ||
env_file: | ||
- switchboard.env | ||
volumes: | ||
- ./frontend.env:/srv/frontend/frontend.env:ro | ||
- ./switchboard.env:/srv/switchboard/switchboard.env:ro | ||
- ./uploads:/uploads/ | ||
- log-volume:/logs | ||
extends: | ||
file: common-services.yml | ||
service: switchboard_common | ||
container_name: switchboard | ||
command: bash -c "cd switchboard; rm -f switchboard.pid; poetry run twistd -noy switchboard.tac --pidfile=switchboard.pid" | ||
nginx: | ||
restart: always | ||
image: thinkst/certbot-nginx | ||
build: ./certbot-nginx | ||
ports: | ||
- "80:80" | ||
- "443:443" | ||
depends_on: | ||
- "frontend" | ||
- "switchboard" | ||
container_name: nginx | ||
env_file: | ||
- certbot.env | ||
volumes: | ||
- /etc/letsencrypt/:/etc/letsencrypt/ | ||
- ./nginx/conf.d:/etc/nginx/conf.d/ | ||
extends: | ||
file: common-services.yml | ||
service: nginx_common_certbot | ||
volumes: | ||
log-volume: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,60 +1,22 @@ | ||
version: '3' | ||
services: | ||
redis: | ||
restart: always | ||
image: redis:7.0.10 | ||
volumes: | ||
- ./data:/data/ | ||
container_name: redis | ||
command: redis-server --appendonly yes --protected-mode no --save 60 1 | ||
extends: | ||
file: common-services.yml | ||
service: redis_common | ||
frontend: | ||
restart: always | ||
image: thinkst/canarytokens | ||
build: ./canarytokens | ||
ports: | ||
- "8082:8082" | ||
env_file: | ||
- frontend.env | ||
volumes: | ||
- ./frontend.env:/srv/frontend/frontend.env:ro | ||
- ./switchboard.env:/srv/switchboard/switchboard.env:ro | ||
- ./uploads:/uploads/ | ||
- log-volume:/logs | ||
extends: | ||
file: common-services.yml | ||
service: frontend_common | ||
container_name: frontend | ||
command: bash -c "cd frontend; poetry run python -m uvicorn app:app --host 0.0.0.0 --port 8082 --log-config log.ini" | ||
switchboard: | ||
restart: always | ||
image: thinkst/canarytokens | ||
build: ./canarytokens | ||
ports: | ||
- "25:25" | ||
- "3306:3306" | ||
- "53:5354" | ||
- "53:5354/udp" | ||
- "6443:6443" | ||
- "8083:8083" | ||
- "51820:51820/udp" | ||
env_file: | ||
- switchboard.env | ||
volumes: | ||
- ./frontend.env:/srv/frontend/frontend.env:ro | ||
- ./switchboard.env:/srv/switchboard/switchboard.env:ro | ||
- ./uploads:/uploads/ | ||
- log-volume:/logs | ||
extends: | ||
file: common-services.yml | ||
service: switchboard_common | ||
container_name: switchboard | ||
command: bash -c "cd switchboard; rm -f switchboard.pid; poetry run twistd -noy switchboard.tac --pidfile=switchboard.pid" | ||
nginx: | ||
restart: always | ||
image: thinkst/canarytokens_nginx | ||
build: ./nginx | ||
ports: | ||
- "80:80" | ||
depends_on: | ||
- "frontend" | ||
- "switchboard" | ||
volumes: | ||
- ./nginx/conf.d:/etc/nginx/conf.d/ | ||
container_name: nginx | ||
command: /usr/sbin/nginx -c /etc/nginx/nginx.conf -g "daemon off;" | ||
extends: | ||
file: common-services.yml | ||
service: nginx_common | ||
volumes: | ||
log-volume: |