Skip to content

Updating config, base image, and default image tag #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu/apache2
FROM ubuntu/apache2:2.4-24.10_edge

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 && \
sed -i 's/Listen 80/Listen 8080/' /etc/apache2/ports.conf
Expand Down
8 changes: 4 additions & 4 deletions terraform-unity/networking.tf
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Create an Application Load Balancer (ALB)
resource "aws_lb" "httpd_alb" {
name = "${var.project}-${var.venue}-httpd-alb"
name = "${var.project}-${var.venue}-httpd-alb"
# temporary switch until SPS tests are fixed
#internal = true
internal = false
load_balancer_type = "application"
security_groups = [aws_security_group.ecs_alb_sg.id]
internal = false
load_balancer_type = "application"
security_groups = [aws_security_group.ecs_alb_sg.id]
# temporary switch until SPS tests are fixed
#subnets = local.subnet_ids
subnets = local.public_subnet_ids
Expand Down
2 changes: 1 addition & 1 deletion terraform-unity/ssm.tf
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ resource "aws_ssm_parameter" "managementproxy_config" {
value = <<-EOT

<Location "/${var.project}/${var.venue}/management/">
ProxyPass "http://${var.mgmt_dns}/" upgrade=websocket retry=5 disablereuse=On
ProxyPass "http://${var.mgmt_dns}/" upgrade=websocket retry=5 addressttl=60
ProxyPassReverse "http://${var.mgmt_dns}/"
ProxyPreserveHost On
FallbackResource /management/index.html
Expand Down
2 changes: 1 addition & 1 deletion terraform-unity/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ variable "installprefix" {
variable "httpd_proxy_version" {
description = "The version of the httpd proxy container"
type = string
default = "0.16.0"
default = "0.16.3"
}

variable "ssm_account_id" {
Expand Down