Skip to content

Commit 6e97df3

Browse files
authored
Merge pull request #12 from unity-sds/480-addressttl-change-image
Updating config, base image, and default image tag
2 parents d929c0a + 8ec2788 commit 6e97df3

4 files changed

Lines changed: 7 additions & 7 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu/apache2
1+
FROM ubuntu/apache2:2.4-24.10_edge
22

33
RUN apt update && apt install -y libapache2-mod-auth-openidc ca-certificates python3-boto3 && a2enmod auth_openidc proxy proxy_http proxy_html proxy_wstunnel ssl substitute rewrite headers && \
44
sed -i 's/Listen 80/Listen 8080/' /etc/apache2/ports.conf

terraform-unity/networking.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Create an Application Load Balancer (ALB)
22
resource "aws_lb" "httpd_alb" {
3-
name = "${var.project}-${var.venue}-httpd-alb"
3+
name = "${var.project}-${var.venue}-httpd-alb"
44
# temporary switch until SPS tests are fixed
55
#internal = true
6-
internal = false
7-
load_balancer_type = "application"
8-
security_groups = [aws_security_group.ecs_alb_sg.id]
6+
internal = false
7+
load_balancer_type = "application"
8+
security_groups = [aws_security_group.ecs_alb_sg.id]
99
# temporary switch until SPS tests are fixed
1010
#subnets = local.subnet_ids
1111
subnets = local.public_subnet_ids

terraform-unity/ssm.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ resource "aws_ssm_parameter" "managementproxy_config" {
2222
value = <<-EOT
2323
2424
<Location "/${var.project}/${var.venue}/management/">
25-
ProxyPass "http://${var.mgmt_dns}/" upgrade=websocket retry=5 disablereuse=On
25+
ProxyPass "http://${var.mgmt_dns}/" upgrade=websocket retry=5 addressttl=60
2626
ProxyPassReverse "http://${var.mgmt_dns}/"
2727
ProxyPreserveHost On
2828
FallbackResource /management/index.html

terraform-unity/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ variable "installprefix" {
3737
variable "httpd_proxy_version" {
3838
description = "The version of the httpd proxy container"
3939
type = string
40-
default = "0.16.0"
40+
default = "0.16.3"
4141
}
4242

4343
variable "ssm_account_id" {

0 commit comments

Comments
 (0)