Skip to content

Commit 87e1c13

Browse files
committed
Add log destination, remove bastion in dev
1 parent 754a343 commit 87e1c13

File tree

2 files changed

+26
-6
lines changed

2 files changed

+26
-6
lines changed

pulumi/__main__.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,17 @@
2525
**psm_opts,
2626
)
2727

28+
logdest_opts = resources.get('tb:cloudwatch:LogDestination', {})
29+
logdests = {
30+
logdest_name: tb_pulumi.cloudwatch.LogDestination(
31+
f'{project.name_prefix}-logdest-{logdest_name}',
32+
app_name=logdest_name,
33+
project=project,
34+
**logdest_config,
35+
)
36+
for logdest_name, logdest_config in logdest_opts.items()
37+
}
38+
2839
# Build out some private network space
2940
vpc_opts = resources['tb:network:MultiTierVpc']['vpc']
3041
vpc = tb_pulumi.network.MultiTierVpc(

pulumi/config.dev.yaml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@ resources:
88
- stalwart.postboot.keycloak_backend
99
recovery_window_in_days: 0
1010

11+
tb:cloudwatch:LogDestination:
12+
stalwart:
13+
log_group:
14+
retention_in_days: 7
15+
log_streams:
16+
stalwart-api-logs: api
17+
stalwart-mail-logs: mail
18+
org_name: tb
19+
1120
tb:network:MultiTierVpc:
1221
vpc:
1322
cidr_block: 10.2.0.0/16
@@ -48,13 +57,13 @@ resources:
4857
endpoint_interfaces:
4958
- secretsmanager
5059

51-
# tb:ec2:SshableInstance: {}
60+
tb:ec2:SshableInstance: {}
5261
# Fill out this template to build an SSH bastion
53-
tb:ec2:SshableInstance:
54-
bastion:
55-
ssh_keypair_name: mailstrom-dev
56-
source_cidrs:
57-
- 10.2.0.0/16 # Internal access
62+
# tb:ec2:SshableInstance:
63+
# bastion:
64+
# ssh_keypair_name: mailstrom-dev
65+
# source_cidrs:
66+
# - 10.2.0.0/16 # Internal access
5867

5968
tb:mailstrom:StalwartCluster:
6069
thundermail:

0 commit comments

Comments
 (0)