Merge pull request #386 from derekhiggins/rm-servername-up

Removed ServerName from VirtualHost Directives
metal3-io · Oct 10, 2022 · 89ba1fb · 89ba1fb
2 parents d79c077 + 3da2f88
commit 89ba1fb
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 4 deletions.
diff --git a/ironic-config/apache2-ironic-api.conf.j2 b/ironic-config/apache2-ironic-api.conf.j2
@@ -42,7 +42,6 @@ Listen {{ env.IRONIC_LISTEN_PORT }}
  CustomLog /dev/stdout combined
 
 {% if env.IRONIC_TLS_SETUP == "true" %}
- ServerName {{ env.IRONIC_IP }}
  SSLEngine on
  SSLProtocol {{ env.IRONIC_SSL_PROTOCOL }}
  SSLCertificateFile {{ env.IRONIC_CERT_FILE }}

diff --git a/ironic-config/apache2-vmedia.conf.j2 b/ironic-config/apache2-vmedia.conf.j2
@@ -5,7 +5,6 @@ Listen {{ env.VMEDIA_TLS_PORT }}
  LogLevel debug
  CustomLog /dev/stdout combined
 
- ServerName {{ env.IRONIC_IP }}
  SSLEngine on
  SSLProtocol {{ env.IRONIC_VMEDIA_SSL_PROTOCOL }}
  SSLCertificateFile {{ env.IRONIC_VMEDIA_CERT_FILE }}

diff --git a/ironic-inspector-config/inspector-apache.conf.j2 b/ironic-inspector-config/inspector-apache.conf.j2
@@ -32,8 +32,6 @@ Listen {{ env.IRONIC_INSPECTOR_LISTEN_PORT }}
  LogLevel debug
  CustomLog /dev/stdout combined
 
- ServerName {{ env.IRONIC_IP }}
-
  SSLEngine On
  SSLProtocol {{ env.IRONIC_SSL_PROTOCOL }}
  SSLCertificateFile {{ env.IRONIC_INSPECTOR_CERT_FILE }}