From d2c6d4f841fd2c37c93080ccfbf21122d3326698 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Fri, 3 Apr 2020 23:53:39 -0400 Subject: make sure the directory exists --- modules/bitwarden/files/bitwarden.service | 2 +- modules/bitwarden/manifests/server.pp | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'modules/bitwarden') diff --git a/modules/bitwarden/files/bitwarden.service b/modules/bitwarden/files/bitwarden.service index 49f422f..e17172e 100644 --- a/modules/bitwarden/files/bitwarden.service +++ b/modules/bitwarden/files/bitwarden.service @@ -3,7 +3,7 @@ Description = runs bitwarden After=network.target [Service] -ExecStart=/usr/bin/docker run --name bitwarden -v /media/persistent/bitwarden/:/data/ -p 8080:80 bitwardenrs/server:latest +ExecStart=/usr/bin/docker run --name bitwarden -v <%- @data_dir %>:/data/ -p 8080:80 bitwardenrs/server:latest Restart=on-failure [Install] diff --git a/modules/bitwarden/manifests/server.pp b/modules/bitwarden/manifests/server.pp index 061af38..f172a27 100644 --- a/modules/bitwarden/manifests/server.pp +++ b/modules/bitwarden/manifests/server.pp @@ -1,4 +1,4 @@ -class bitwarden::server { +class bitwarden::server($data_dir) { include docker include systemd @@ -8,9 +8,12 @@ class bitwarden::server { require => Service["docker"]; } - file { "/etc/systemd/system/bitwarden.service": - source => "puppet:///modules/bitwarden/bitwarden.service", - notify => Exec["/usr/bin/systemctl daemon-reload"]; + file { + $data_dir: + ensure => directory; + "/etc/systemd/system/bitwarden.service": + source => "puppet:///modules/bitwarden/bitwarden.service", + notify => Exec["/usr/bin/systemctl daemon-reload"]; } service { "bitwarden": -- cgit v1.2.3-54-g00ecf