puppet: Only include "app_service" section if there are apps.

This works around gravitational/teleport#12256, but also produces config
files that are slightly cleaner.
This commit is contained in:
Alex Vandiver 2022-04-26 16:06:57 -07:00 committed by Tim Abbott
parent a543dcc8e3
commit 35db1ee435
4 changed files with 14 additions and 6 deletions

View File

@ -0,0 +1,3 @@
app_service:
enabled: yes
apps:

View File

@ -32,9 +32,3 @@ proxy_service:
enabled: no enabled: no
auth_service: auth_service:
enabled: no enabled: no
# We intentionally end with `app_service` so we can append services under
# `apps:` via puppet.
app_service:
enabled: yes
apps:

View File

@ -6,6 +6,7 @@ define zulip_ops::teleport::application (
$description = '', $description = '',
$order = '50', $order = '50',
) { ) {
include zulip_ops::teleport::application_top
concat::fragment { "teleport_app_${name}": concat::fragment { "teleport_app_${name}":
target => '/etc/teleport_node.yaml', target => '/etc/teleport_node.yaml',
order => $order, order => $order,

View File

@ -0,0 +1,10 @@
# @summary Enables application support on the node; include once.
#
# See https://goteleport.com/docs/application-access/
class zulip_ops::teleport::application_top {
concat::fragment { 'teleport_app':
target => '/etc/teleport_node.yaml',
order => '10',
source => 'puppet:///modules/zulip_ops/teleport_app.yaml',
}
}