From 596e498a0032234fe296700b024c900f1ccbb516 Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Sat, 24 May 2025 20:23:56 +1000 Subject: [PATCH] feat: change media arr apps to hiera_include (#296) - change profiles::media::* to be hiera_included - this is required to enable it to be hiera_excluded on virtual == lxc Reviewed-on: https://git.query.consul/unkinben/puppet-prod/pulls/296 --- hieradata/roles/apps/media/lidarr.yaml | 1 + hieradata/roles/apps/media/prowlarr.yaml | 1 + hieradata/roles/apps/media/radarr.yaml | 1 + hieradata/roles/apps/media/readarr.yaml | 1 + hieradata/roles/apps/media/sonarr.yaml | 1 + site/roles/manifests/apps/media/lidarr.pp | 1 - site/roles/manifests/apps/media/prowlarr.pp | 1 - site/roles/manifests/apps/media/radarr.pp | 1 - site/roles/manifests/apps/media/readarr.pp | 1 - site/roles/manifests/apps/media/sonarr.pp | 1 - 10 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hieradata/roles/apps/media/lidarr.yaml b/hieradata/roles/apps/media/lidarr.yaml index 5c3b754..87911c3 100644 --- a/hieradata/roles/apps/media/lidarr.yaml +++ b/hieradata/roles/apps/media/lidarr.yaml @@ -2,6 +2,7 @@ hiera_include: - lidarr - profiles::nginx::ldapauth + - profiles::media::lidarr # manage lidarr lidarr::params::user: lidarr diff --git a/hieradata/roles/apps/media/prowlarr.yaml b/hieradata/roles/apps/media/prowlarr.yaml index 7ee7e70..38280cb 100644 --- a/hieradata/roles/apps/media/prowlarr.yaml +++ b/hieradata/roles/apps/media/prowlarr.yaml @@ -2,6 +2,7 @@ hiera_include: - prowlarr - profiles::nginx::ldapauth + - profiles::media::prowlarr # manage prowlarr prowlarr::params::user: prowlarr diff --git a/hieradata/roles/apps/media/radarr.yaml b/hieradata/roles/apps/media/radarr.yaml index 1cd50a4..64c9076 100644 --- a/hieradata/roles/apps/media/radarr.yaml +++ b/hieradata/roles/apps/media/radarr.yaml @@ -2,6 +2,7 @@ hiera_include: - radarr - profiles::nginx::ldapauth + - profiles::media::radarr # manage radarr radarr::params::user: radarr diff --git a/hieradata/roles/apps/media/readarr.yaml b/hieradata/roles/apps/media/readarr.yaml index ee17dce..b8cf38c 100644 --- a/hieradata/roles/apps/media/readarr.yaml +++ b/hieradata/roles/apps/media/readarr.yaml @@ -2,6 +2,7 @@ hiera_include: - readarr - profiles::nginx::ldapauth + - profiles::media::readarr # manage readarr readarr::params::user: readarr diff --git a/hieradata/roles/apps/media/sonarr.yaml b/hieradata/roles/apps/media/sonarr.yaml index 578bbff..32969e0 100644 --- a/hieradata/roles/apps/media/sonarr.yaml +++ b/hieradata/roles/apps/media/sonarr.yaml @@ -2,6 +2,7 @@ hiera_include: - sonarr - profiles::nginx::ldapauth + - profiles::media::sonarr # manage sonarr sonarr::params::user: sonarr diff --git a/site/roles/manifests/apps/media/lidarr.pp b/site/roles/manifests/apps/media/lidarr.pp index 5278575..2691cc2 100644 --- a/site/roles/manifests/apps/media/lidarr.pp +++ b/site/roles/manifests/apps/media/lidarr.pp @@ -6,6 +6,5 @@ class roles::apps::media::lidarr { }else{ include profiles::defaults include profiles::base - include profiles::media::lidarr } } diff --git a/site/roles/manifests/apps/media/prowlarr.pp b/site/roles/manifests/apps/media/prowlarr.pp index 03e0839..4dd5854 100644 --- a/site/roles/manifests/apps/media/prowlarr.pp +++ b/site/roles/manifests/apps/media/prowlarr.pp @@ -6,6 +6,5 @@ class roles::apps::media::prowlarr { }else{ include profiles::defaults include profiles::base - include profiles::media::prowlarr } } diff --git a/site/roles/manifests/apps/media/radarr.pp b/site/roles/manifests/apps/media/radarr.pp index c94ae81..93fca24 100644 --- a/site/roles/manifests/apps/media/radarr.pp +++ b/site/roles/manifests/apps/media/radarr.pp @@ -6,6 +6,5 @@ class roles::apps::media::radarr { }else{ include profiles::defaults include profiles::base - include profiles::media::radarr } } diff --git a/site/roles/manifests/apps/media/readarr.pp b/site/roles/manifests/apps/media/readarr.pp index adbd553..0dfcf55 100644 --- a/site/roles/manifests/apps/media/readarr.pp +++ b/site/roles/manifests/apps/media/readarr.pp @@ -6,6 +6,5 @@ class roles::apps::media::readarr { }else{ include profiles::defaults include profiles::base - include profiles::media::readarr } } diff --git a/site/roles/manifests/apps/media/sonarr.pp b/site/roles/manifests/apps/media/sonarr.pp index 07a919c..0ceab35 100644 --- a/site/roles/manifests/apps/media/sonarr.pp +++ b/site/roles/manifests/apps/media/sonarr.pp @@ -6,6 +6,5 @@ class roles::apps::media::sonarr { }else{ include profiles::defaults include profiles::base - include profiles::media::sonarr } }