systems/infrastructure
1
Fork 0
Code Issues 1 Pull requests 17 Activity Actions

Rename more bitwarden things

Browse source 
Serving on both domains currently, i'll migrate clients and fix that
This commit is contained in:
Jake Howard 2021-05-18 22:18:05 +01:00
parent 71a30c8815
commit 48e07d2a7e
Signed by: jake
GPG key ID: 57AFB45680EDD477
3 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ansible/roles/vaultwarden/files/docker-compose.yml
View file

@ -13,12 +13,12 @@ services:
labels: labels:
- traefik.enable=true - traefik.enable=true
- traefik.http.routers.vaultwarden-ui.rule=Host(`bw.jakehoward.tech`) - traefik.http.routers.vaultwarden-ui.rule=Host(`bw.jakehoward.tech`) || Host(`vaultwarden.jakehoward.tech`)
- traefik.http.routers.vaultwarden-ui.service=vaultwarden-ui - traefik.http.routers.vaultwarden-ui.service=vaultwarden-ui
- traefik.http.services.vaultwarden-ui.loadbalancer.server.port=80 - traefik.http.services.vaultwarden-ui.loadbalancer.server.port=80
- traefik.http.routers.vaultwarden-ui.tls.certresolver=le - traefik.http.routers.vaultwarden-ui.tls.certresolver=le
- traefik.http.routers.vaultwarden-websocket.rule=Host(`bw.jakehoward.tech`) && Path(`/notifications/hub`) - traefik.http.routers.vaultwarden-websocket.rule=(Host(`bw.jakehoward.tech`) || Host(`vaultwarden.jakehoward.tech`) )&& Path(`/notifications/hub`)
- traefik.http.routers.vaultwarden-websocket.service=vaultwarden-websocket - traefik.http.routers.vaultwarden-websocket.service=vaultwarden-websocket
- traefik.http.services.vaultwarden-websocket.loadbalancer.server.port=3012 - traefik.http.services.vaultwarden-websocket.loadbalancer.server.port=3012
- traefik.http.routers.vaultwarden-websocket.tls.certresolver=le - traefik.http.routers.vaultwarden-websocket.tls.certresolver=le
@ -31,11 +31,11 @@ services:
- traefik.http.routers.vaultwarden-websocket.middlewares=vaultwarden-ratelimit,vaultwarden-compress - traefik.http.routers.vaultwarden-websocket.middlewares=vaultwarden-ratelimit,vaultwarden-compress
environment: environment:
- SIGNUPS_ALLOWED=false - SIGNUPS_ALLOWED=false
- DOMAIN=https://bw.jakehoward.tech - DOMAIN=https://vaultwarden.jakehoward.tech
- SHOW_PASSWORD_HINT=false - SHOW_PASSWORD_HINT=false
- DATABASE_URL=postgres://bitwarden:{{ bitwarden_database_password }}@db/bitwarden - DATABASE_URL=postgres://vaultwarden:{{ vaultwarden_database_password }}@db/vaultwarden
- INVITATIONS_ALLOWED=false - INVITATIONS_ALLOWED=false
- ROCKET_WORKERS={{ ansible_processor_nproc }} - ROCKET_WORKERS={{ ansible_processor_nproc // 2 }}
- WEBSOCKET_ENABLED=true - WEBSOCKET_ENABLED=true
db: db:
@ -44,5 +44,5 @@ services:
volumes: volumes:
- /mnt/tank/dbs/postgres/vaultwarden/:/var/lib/postgresql/data - /mnt/tank/dbs/postgres/vaultwarden/:/var/lib/postgresql/data
environment: environment:
- POSTGRES_PASSWORD={{ bitwarden_database_password }} - POSTGRES_PASSWORD={{ vaultwarden_database_password }}
- POSTGRES_USER=bitwarden - POSTGRES_USER=vaultwarden

2
ansible/roles/vaultwarden/vars/main.yml
View file

@ -1,4 +1,4 @@
bitwarden_database_password: !vault | vaultwarden_database_password: !vault |
$ANSIBLE_VAULT;1.1;AES256 $ANSIBLE_VAULT;1.1;AES256
37666163343038663763633038323938383665386463666239313431626334613432346462656366 37666163343038663763633038323938383665386463666239313431626334613432346462656366
3937363766396236326333353332393564623736336535630a333930613864396536366330633438 3937363766396236326333353332393564623736336535630a333930613864396536366330633438

8
terraform/jakehoward.tech.tf
View file

@ -147,3 +147,11 @@ resource "cloudflare_record" "jakehowardtech_bw" {
type = "A" type = "A"
ttl = 1 ttl = 1
} }
resource "cloudflare_record" "jakehowardtech_vaultwarden" {
zone_id = cloudflare_zone.jakehowardtech.id
name = "vaultwarden"
value = vultr_instance.casey.main_ip
type = "A"
ttl = 1
}