Merge branch 'release/2.5.5'

suhancz · Dec 13, 2023 · 0c2dadc · 0c2dadc
2 parents 5ff923d + a8a1920
commit 0c2dadc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/templates/httpd/postfixadmin-le-ssl.conf.j2 b/templates/httpd/postfixadmin-le-ssl.conf.j2
@@ -2,6 +2,7 @@
 SSLStaplingCache shmcb:/var/run/apache2/stapling_cache(128000)
 <VirtualHost *:443>
   ServerName postfixadmin.vpn.{{ mailserver_domain }}
+  ServerAlias postfixadmin.{{ mailserver_domain }}
 
   DocumentRoot /var/www/postfixadmin/public/
 

diff --git a/templates/httpd/postfixadmin.conf.j2 b/templates/httpd/postfixadmin.conf.j2
@@ -1,5 +1,6 @@
 <VirtualHost *:80>
   ServerName postfixadmin.vpn.{{ mailserver_domain }}
+  ServerAlias postfixadmin.{{ mailserver_domain }}
 
   RewriteEngine on
   RewriteCond %{SERVER_NAME} =postfixadmin.vpn.{{ mailserver_domain }}

diff --git a/templates/httpd/poweradmin-le-ssl.conf.j2 b/templates/httpd/poweradmin-le-ssl.conf.j2
@@ -2,6 +2,7 @@
 SSLStaplingCache shmcb:/var/run/apache2/stapling_cache(128000)
 <VirtualHost *:443>
   ServerName poweradmin.vpn.{{ mailserver_domain }}
+  ServerAlias poweradmin.{{ mailserver_domain }}
 
   DocumentRoot /var/www/poweradmin/
 

diff --git a/templates/httpd/poweradmin.conf.j2 b/templates/httpd/poweradmin.conf.j2
@@ -1,5 +1,6 @@
 <VirtualHost *:80>
   ServerName poweradmin.vpn.{{ mailserver_domain }}
+  ServerAlias poweradmin.{{ mailserver_domain }}
 
   RewriteEngine on
   RewriteCond %{SERVER_NAME} =poweradmin.vpn.{{ mailserver_domain }}