Skip to content

Commit

Permalink
reverting image updates
Browse files Browse the repository at this point in the history
new image doesn't properly support oidc mod auth, and is configured far differently. safer just to wait until image updates
  • Loading branch information
jpl-btlunsfo committed Sep 25, 2024
1 parent ff45461 commit f321abf
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM httpd:2.4.62
FROM ubuntu/apache2

RUN apt update && apt install -y apache2 libapache2-mod-auth-openidc ca-certificates python3-boto3 && a2enmod auth_openidc proxy proxy_http proxy_html proxy_wstunnel ssl substitute rewrite headers && \
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

COPY write_site.py /usr/local/bin/

CMD ["/bin/bash", "-c", "python3 /usr/local/bin/write_site.py && httpd-foreground"]
CMD ["/bin/bash", "-c", "python3 /usr/local/bin/write_site.py && apache2-foreground"]
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 addressttl=5
ProxyPass "http://${var.mgmt_dns}/" upgrade=websocket retry=5 disablereuse=On
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.2"
default = "0.16.0"
}

variable "ssm_account_id" {
Expand Down

0 comments on commit f321abf

Please sign in to comment.