diff --git a/defaults/main.yml b/defaults/main.yml new file mode 100644 index 0000000..6030660 --- /dev/null +++ b/defaults/main.yml @@ -0,0 +1,8 @@ +--- + +bitwarden_prefix: pass +bitwarden_image: vaultwarden/server +bitwarden_version: 1.24.0-alpine +bitwarden_port_web: 80 +bitwarden_port_ws: 3021 +domain: example.com diff --git a/meta/main.yml b/meta/main.yml index c97c962..bf74573 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,3 +1,4 @@ +--- galaxy_info: author: thiuda description: role to deploy bitwarden behind nginx reverse proxy @@ -6,7 +7,8 @@ galaxy_info: min_ansible_version: 2.1 galaxy_tags: [] platforms: - - name: Debian - versions: + - name: Debian + versions: - 10 -dependencies: [] \ No newline at end of file +dependencies: [] + diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2 index 1282733..5820af1 100644 --- a/templates/docker-compose.yml.j2 +++ b/templates/docker-compose.yml.j2 @@ -5,7 +5,7 @@ version: "3.4" services: bitwarden: - image: bitwardenrs/server:{{ bitwarden_version }}-alpine + image: {{ bitwarden_image }}:{{ bitwarden_version }} restart: unless-stopped container_name: bitwarden hostname: bitwarden diff --git a/templates/reverse_proxy.conf.j2 b/templates/reverse_proxy.conf.j2 index f7e6b8a..c1ee891 100644 --- a/templates/reverse_proxy.conf.j2 +++ b/templates/reverse_proxy.conf.j2 @@ -6,7 +6,7 @@ server { listen [::]:443 ssl http2; listen 3012 ssl http2; listen [::]:3012 ssl http2; - server_name {{ bitwarden_domain }}; + server_name {{ bitwarden_prefix }}.{{ domain }}; ## # SSL Settings @@ -73,13 +73,13 @@ server { server { - if ($host = {{ bitwarden_domain }}) { + if ($host = {{ bitwarden_prefix }}.{{ domain }) { return 301 https://$host$request_uri; } listen 80; listen [::]:80; - server_name {{ bitwarden_domain }}; + server_name {{ bitwarden_prefix }}.{{ domain }}; location / { return 301 https://$host$request_uri;