Fix missing star on optional include.

ScIT-Raphael · ScIT-Raphael · commit 3bc5ef13a6aa · 2019-02-28T12:30:10.000+01:00
diff --git a/install/debian/8/multiphp/apache2/PHP-56.tpl b/install/debian/8/multiphp/apache2/PHP-56.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
diff --git a/install/debian/8/multiphp/apache2/PHP-70.tpl b/install/debian/8/multiphp/apache2/PHP-70.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
diff --git a/install/debian/8/multiphp/apache2/PHP-71.tpl b/install/debian/8/multiphp/apache2/PHP-71.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
diff --git a/install/debian/8/multiphp/apache2/PHP-72.tpl b/install/debian/8/multiphp/apache2/PHP-72.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
diff --git a/install/debian/8/multiphp/apache2/PHP-73.tpl b/install/debian/8/multiphp/apache2/PHP-73.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
diff --git a/install/debian/8/templates/web/apache2/default.tpl b/install/debian/8/templates/web/apache2/default.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %docroot%>
         AllowOverride All
diff --git a/install/debian/8/templates/web/apache2/hosting.tpl b/install/debian/8/templates/web/apache2/hosting.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %docroot%>
         AllowOverride All
diff --git a/install/debian/8/templates/web/apache2/phpcgi.tpl b/install/debian/8/templates/web/apache2/phpcgi.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %docroot%>
         AllowOverride All
diff --git a/install/debian/8/templates/web/apache2/phpfcgid.tpl b/install/debian/8/templates/web/apache2/phpfcgid.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %docroot%>
         AllowOverride All
diff --git a/install/debian/9/multiphp/apache2/PHP-56.tpl b/install/debian/9/multiphp/apache2/PHP-56.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
diff --git a/install/debian/9/multiphp/apache2/PHP-70.tpl b/install/debian/9/multiphp/apache2/PHP-70.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
diff --git a/install/debian/9/multiphp/apache2/PHP-71.tpl b/install/debian/9/multiphp/apache2/PHP-71.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
diff --git a/install/debian/9/multiphp/apache2/PHP-72.tpl b/install/debian/9/multiphp/apache2/PHP-72.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
diff --git a/install/debian/9/multiphp/apache2/PHP-73.tpl b/install/debian/9/multiphp/apache2/PHP-73.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
diff --git a/install/debian/9/templates/web/apache2/default.tpl b/install/debian/9/templates/web/apache2/default.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %docroot%>
         AllowOverride All
diff --git a/install/debian/9/templates/web/apache2/hosting.tpl b/install/debian/9/templates/web/apache2/hosting.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %docroot%>
         AllowOverride All
diff --git a/install/debian/9/templates/web/apache2/phpcgi.tpl b/install/debian/9/templates/web/apache2/phpcgi.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %docroot%>
         AllowOverride All
diff --git a/install/debian/9/templates/web/apache2/phpfcgid.tpl b/install/debian/9/templates/web/apache2/phpfcgid.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %docroot%>
         AllowOverride All
diff --git a/install/ubuntu/14.04/multiphp/apache2/PHP-56.tpl b/install/ubuntu/14.04/multiphp/apache2/PHP-56.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
diff --git a/install/ubuntu/14.04/multiphp/apache2/PHP-70.tpl b/install/ubuntu/14.04/multiphp/apache2/PHP-70.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
diff --git a/install/ubuntu/14.04/multiphp/apache2/PHP-71.tpl b/install/ubuntu/14.04/multiphp/apache2/PHP-71.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
diff --git a/install/ubuntu/14.04/multiphp/apache2/PHP-72.tpl b/install/ubuntu/14.04/multiphp/apache2/PHP-72.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
diff --git a/install/ubuntu/14.04/multiphp/apache2/PHP-73.tpl b/install/ubuntu/14.04/multiphp/apache2/PHP-73.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
diff --git a/install/ubuntu/14.04/templates/web/apache2/basedir.tpl b/install/ubuntu/14.04/templates/web/apache2/basedir.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %docroot%>
         AllowOverride All
diff --git a/install/ubuntu/14.04/templates/web/apache2/default.tpl b/install/ubuntu/14.04/templates/web/apache2/default.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %docroot%>
         AllowOverride All
diff --git a/install/ubuntu/14.04/templates/web/apache2/hosting.tpl b/install/ubuntu/14.04/templates/web/apache2/hosting.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %docroot%>
         AllowOverride All
diff --git a/install/ubuntu/14.04/templates/web/apache2/phpcgi.tpl b/install/ubuntu/14.04/templates/web/apache2/phpcgi.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %docroot%>
         AllowOverride All
diff --git a/install/ubuntu/14.04/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/14.04/templates/web/apache2/phpfcgid.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %docroot%>
         AllowOverride All
diff --git a/install/ubuntu/16.04/multiphp/apache2/PHP-56.tpl b/install/ubuntu/16.04/multiphp/apache2/PHP-56.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
diff --git a/install/ubuntu/16.04/multiphp/apache2/PHP-70.tpl b/install/ubuntu/16.04/multiphp/apache2/PHP-70.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
diff --git a/install/ubuntu/16.04/multiphp/apache2/PHP-71.tpl b/install/ubuntu/16.04/multiphp/apache2/PHP-71.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
diff --git a/install/ubuntu/16.04/multiphp/apache2/PHP-72.tpl b/install/ubuntu/16.04/multiphp/apache2/PHP-72.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
diff --git a/install/ubuntu/16.04/multiphp/apache2/PHP-73.tpl b/install/ubuntu/16.04/multiphp/apache2/PHP-73.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
diff --git a/install/ubuntu/16.04/templates/web/apache2/default.tpl b/install/ubuntu/16.04/templates/web/apache2/default.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %docroot%>
         AllowOverride All
diff --git a/install/ubuntu/16.04/templates/web/apache2/hosting.tpl b/install/ubuntu/16.04/templates/web/apache2/hosting.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %docroot%>
         AllowOverride All
diff --git a/install/ubuntu/16.04/templates/web/apache2/phpcgi.tpl b/install/ubuntu/16.04/templates/web/apache2/phpcgi.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %docroot%>
         AllowOverride All
diff --git a/install/ubuntu/16.04/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/16.04/templates/web/apache2/phpfcgid.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %docroot%>
         AllowOverride All
diff --git a/install/ubuntu/18.04/multiphp/apache2/PHP-56.tpl b/install/ubuntu/18.04/multiphp/apache2/PHP-56.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
diff --git a/install/ubuntu/18.04/multiphp/apache2/PHP-70.tpl b/install/ubuntu/18.04/multiphp/apache2/PHP-70.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
diff --git a/install/ubuntu/18.04/multiphp/apache2/PHP-71.tpl b/install/ubuntu/18.04/multiphp/apache2/PHP-71.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
diff --git a/install/ubuntu/18.04/multiphp/apache2/PHP-72.tpl b/install/ubuntu/18.04/multiphp/apache2/PHP-72.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
diff --git a/install/ubuntu/18.04/multiphp/apache2/PHP-73.tpl b/install/ubuntu/18.04/multiphp/apache2/PHP-73.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
diff --git a/install/ubuntu/18.04/templates/web/apache2/default.tpl b/install/ubuntu/18.04/templates/web/apache2/default.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %docroot%>
         AllowOverride All
diff --git a/install/ubuntu/18.04/templates/web/apache2/hosting.tpl b/install/ubuntu/18.04/templates/web/apache2/hosting.tpl
@@ -12,7 +12,7 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
         
-    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf
+    IncludeOptional %home%/%user%/conf/web/forcessl.apache2.%domain%.conf*
     
     <Directory %docroot%>
         AllowOverride All
diff --git a/install/ubuntu/18.04/templates/web/apache2/phpcgi.tpl b/install/ubuntu/18.04/templates/web/apache2/phpcgi.tpl
diff --git a/install/ubuntu/18.04/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/18.04/templates/web/apache2/phpfcgid.tpl
