correctly use server_aliases and update tests (#192)

OSC · Jun 7, 2023 · 370a733 · 370a733
1 parent 385d4ee
commit 370a733
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/molecule/default/fixtures/config/ood_portal.yml.custom.apache2 b/molecule/default/fixtures/config/ood_portal.yml.custom.apache2
@@ -20,7 +20,8 @@ servername: localhost
 # Example:
 #     server_aliases:
 #       - foo.example.com
-#server_aliases: []
+server_aliases:
+  - 'other-site.notrealdoman.edu'
 
 # The server name used for rewrites
 # Example:

diff --git a/molecule/default/fixtures/config/ood_portal.yml.custom.httpd b/molecule/default/fixtures/config/ood_portal.yml.custom.httpd
@@ -20,7 +20,8 @@ servername: localhost
 # Example:
 #     server_aliases:
 #       - foo.example.com
-#server_aliases: []
+server_aliases:
+  - 'other-site.notrealdoman.edu'
 
 # The server name used for rewrites
 # Example:

diff --git a/molecule/default/fixtures/config/ood_portal.yml.custom.httpd24-httpd b/molecule/default/fixtures/config/ood_portal.yml.custom.httpd24-httpd
@@ -20,7 +20,8 @@ servername: localhost
 # Example:
 #     server_aliases:
 #       - foo.example.com
-#server_aliases: []
+server_aliases:
+  - 'other-site.notrealdoman.edu'
 
 # The server name used for rewrites
 # Example:

diff --git a/molecule/default/vars/portal.yml b/molecule/default/vars/portal.yml
@@ -14,6 +14,9 @@ security_strict_transport: true
 pun_pre_hook_exports: 'OIDC_ACCESS_TOKEN,OIDC_CLAIM_EMAIL'
 pun_pre_hook_root_cmd: '/opt/site/site_pre_hook'
 
+server_aliases:
+  - other-site.notrealdoman.edu
+
 ood_auth_openidc:
   OIDCSessionMaxDuration: 28888
   OIDCClientID: myid

diff --git a/templates/ood_portal.yml.j2 b/templates/ood_portal.yml.j2
@@ -26,7 +26,7 @@
 #       - foo.example.com
 {% if server_aliases is defined and server_aliases|length > 0 %}
 server_aliases:
-{% for item in maintenance_ip_allowlist  %}
+{% for item in server_aliases  %}
   - '{{ item }}'
 {% endfor %}
 {% else %}