From b60538a1a7d7632050e7192b5ae5af1bfeac369c Mon Sep 17 00:00:00 2001 From: Jeff Ohrstrom Date: Wed, 10 Apr 2024 12:43:07 -0400 Subject: [PATCH] correct fixture files --- ood-portal-generator/spec/fixtures/ood-portal.conf.all | 2 +- ood-portal-generator/spec/fixtures/ood-portal.conf.dex-full | 2 +- ood-portal-generator/spec/fixtures/ood-portal.conf.dex-ldap | 2 +- ood-portal-generator/spec/fixtures/ood-portal.conf.dex-no-proxy | 2 +- ood-portal-generator/spec/fixtures/ood-portal.conf.oidc-ssl | 2 +- .../spec/fixtures/ood-portal.dex-full.proxy.conf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ood-portal-generator/spec/fixtures/ood-portal.conf.all b/ood-portal-generator/spec/fixtures/ood-portal.conf.all index 62a73cfe4e..9e3a53e702 100644 --- a/ood-portal-generator/spec/fixtures/ood-portal.conf.all +++ b/ood-portal-generator/spec/fixtures/ood-portal.conf.all @@ -54,7 +54,7 @@ Listen 8080 ServerAlias foo.example.com RewriteEngine On - RewriteRule ^(.*) https://test.proxy.name:8080$1 [R=301,NE,L] + RewriteRule ^(.*) https://%{HTTP_HOST}:8080$1 [R=301,NE,L] # The Open OnDemand portal VirtualHost diff --git a/ood-portal-generator/spec/fixtures/ood-portal.conf.dex-full b/ood-portal-generator/spec/fixtures/ood-portal.conf.dex-full index a07936eb37..2afe9bff8e 100644 --- a/ood-portal-generator/spec/fixtures/ood-portal.conf.dex-full +++ b/ood-portal-generator/spec/fixtures/ood-portal.conf.dex-full @@ -47,7 +47,7 @@ ServerName example.com RewriteEngine On - RewriteRule ^(.*) https://example.com:443$1 [R=301,NE,L] + RewriteRule ^(.*) https://%{HTTP_HOST}:443$1 [R=301,NE,L] # The Open OnDemand portal VirtualHost diff --git a/ood-portal-generator/spec/fixtures/ood-portal.conf.dex-ldap b/ood-portal-generator/spec/fixtures/ood-portal.conf.dex-ldap index e9e434785a..66574daced 100644 --- a/ood-portal-generator/spec/fixtures/ood-portal.conf.dex-ldap +++ b/ood-portal-generator/spec/fixtures/ood-portal.conf.dex-ldap @@ -47,7 +47,7 @@ ServerName example.com RewriteEngine On - RewriteRule ^(.*) https://example.com:443$1 [R=301,NE,L] + RewriteRule ^(.*) https://%{HTTP_HOST}:443$1 [R=301,NE,L] # The Open OnDemand portal VirtualHost diff --git a/ood-portal-generator/spec/fixtures/ood-portal.conf.dex-no-proxy b/ood-portal-generator/spec/fixtures/ood-portal.conf.dex-no-proxy index 1c0092b7fc..f91f667285 100644 --- a/ood-portal-generator/spec/fixtures/ood-portal.conf.dex-no-proxy +++ b/ood-portal-generator/spec/fixtures/ood-portal.conf.dex-no-proxy @@ -47,7 +47,7 @@ ServerName example.com RewriteEngine On - RewriteRule ^(.*) https://example.com:443$1 [R=301,NE,L] + RewriteRule ^(.*) https://%{HTTP_HOST}:443$1 [R=301,NE,L] # The Open OnDemand portal VirtualHost diff --git a/ood-portal-generator/spec/fixtures/ood-portal.conf.oidc-ssl b/ood-portal-generator/spec/fixtures/ood-portal.conf.oidc-ssl index 132624f846..230d3db741 100644 --- a/ood-portal-generator/spec/fixtures/ood-portal.conf.oidc-ssl +++ b/ood-portal-generator/spec/fixtures/ood-portal.conf.oidc-ssl @@ -47,7 +47,7 @@ ServerName ondemand.example.com RewriteEngine On - RewriteRule ^(.*) https://ondemand.example.com:443$1 [R=301,NE,L] + RewriteRule ^(.*) https://%{HTTP_HOST}:443$1 [R=301,NE,L] # The Open OnDemand portal VirtualHost diff --git a/ood-portal-generator/spec/fixtures/ood-portal.dex-full.proxy.conf b/ood-portal-generator/spec/fixtures/ood-portal.dex-full.proxy.conf index cd3c79a99d..01babb5baa 100644 --- a/ood-portal-generator/spec/fixtures/ood-portal.dex-full.proxy.conf +++ b/ood-portal-generator/spec/fixtures/ood-portal.dex-full.proxy.conf @@ -47,7 +47,7 @@ ServerName example.com RewriteEngine On - RewriteRule ^(.*) https://example-proxy.com:443$1 [R=301,NE,L] + RewriteRule ^(.*) https://%{HTTP_HOST}:443$1 [R=301,NE,L] # The Open OnDemand portal VirtualHost