From 1172374e7ddf5464d944ec92d266fc212b46a323 Mon Sep 17 00:00:00 2001 From: lamont Date: Sun, 15 Aug 2021 14:03:14 -0700 Subject: [PATCH 1/3] probably working elk+sg+subnets+vpc --- attributes/default.rb | 1 + metadata.rb | 2 +- recipes/default.rb | 11 ++++++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index 7a1f9af..c4044a1 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -1,3 +1,4 @@ default['frPlex']['media']['nfs'] = 'some.lan.host:/exported/media' default['frPlex']['mount_nfs'] = true default['frPlex']['manage_zfs'] = true +default['frPlex']['plex_claim'] - nil diff --git a/metadata.rb b/metadata.rb index 1bf63ff..92edd97 100644 --- a/metadata.rb +++ b/metadata.rb @@ -9,6 +9,6 @@ chef_version '>= 13.0' supports 'ubuntu', '>= 16.04' -version '0.3.0' +version '0.3.2' depends 'docker', '~> 5.0' diff --git a/recipes/default.rb b/recipes/default.rb index b600ff9..baa04a6 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -34,8 +34,8 @@ package 'zfsutils-linux' # I manually ran build@docker1:~$ sudo zpool create tank vdb vdc -f -execute 'zpool create tank vdb vdc -f' do - not_if 'zpool list | grep tank' +execute '/sbin/zpool create tank vdb vdc -f' do + not_if '/sbin/zpool list | grep tank' only_if { node['frPlex']['manage_zfs'] } end @@ -70,10 +70,15 @@ tag 'plexpass' end +plex_env = %w[VERSION=latest PLEX_UID=1023 PLEX_GID=1023] +if node['frPlex']['plex_claim'] + plex_env << "PLEX_CLAIM=#{node['frPlex']['plex_claim']}" +end + docker_container 'plex' do repo 'plexinc/pms-docker' tag 'plexpass' - env ['VERSION=latest', 'PLEX_UID=1023', 'PLEX_GID=1023'] + env plex_env restart_policy 'always' network_mode 'host' volumes %w(plex-config:/config From 2d0d2866383fa8bb443ea9a81a3072dff3f2fb03 Mon Sep 17 00:00:00 2001 From: lamont Date: Sun, 15 Aug 2021 14:14:08 -0700 Subject: [PATCH 2/3] typo. --- attributes/default.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/attributes/default.rb b/attributes/default.rb index c4044a1..7548f38 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -1,4 +1,4 @@ default['frPlex']['media']['nfs'] = 'some.lan.host:/exported/media' default['frPlex']['mount_nfs'] = true default['frPlex']['manage_zfs'] = true -default['frPlex']['plex_claim'] - nil +default['frPlex']['plex_claim'] = nil From 39964572545e219367c5761aa67b6d0b0a685f61 Mon Sep 17 00:00:00 2001 From: lamont Date: Sun, 15 Aug 2021 14:17:31 -0700 Subject: [PATCH 3/3] get the cookbook actions working again --- .github/workflows/static.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index d4f415c..1be3b40 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -12,6 +12,6 @@ jobs: - name: checkout uses: actions/checkout@v1 - name: lint - uses: FastRobot/chef-cookbook-action@master + uses: FastRobot/chef-cookbook-action@main with: chef_actions_task: 'lint'