Просмотр исходного кода

Fix missing star on optional include.

Raphael Schneeberger 7 лет назад
Родитель
Сommit
3bc5ef13a6
46 измененных файлов с 46 добавлено и 46 удалено
  1. 1 1
      install/debian/8/multiphp/apache2/PHP-56.tpl
  2. 1 1
      install/debian/8/multiphp/apache2/PHP-70.tpl
  3. 1 1
      install/debian/8/multiphp/apache2/PHP-71.tpl
  4. 1 1
      install/debian/8/multiphp/apache2/PHP-72.tpl
  5. 1 1
      install/debian/8/multiphp/apache2/PHP-73.tpl
  6. 1 1
      install/debian/8/templates/web/apache2/default.tpl
  7. 1 1
      install/debian/8/templates/web/apache2/hosting.tpl
  8. 1 1
      install/debian/8/templates/web/apache2/phpcgi.tpl
  9. 1 1
      install/debian/8/templates/web/apache2/phpfcgid.tpl
  10. 1 1
      install/debian/9/multiphp/apache2/PHP-56.tpl
  11. 1 1
      install/debian/9/multiphp/apache2/PHP-70.tpl
  12. 1 1
      install/debian/9/multiphp/apache2/PHP-71.tpl
  13. 1 1
      install/debian/9/multiphp/apache2/PHP-72.tpl
  14. 1 1
      install/debian/9/multiphp/apache2/PHP-73.tpl
  15. 1 1
      install/debian/9/templates/web/apache2/default.tpl
  16. 1 1
      install/debian/9/templates/web/apache2/hosting.tpl
  17. 1 1
      install/debian/9/templates/web/apache2/phpcgi.tpl
  18. 1 1
      install/debian/9/templates/web/apache2/phpfcgid.tpl
  19. 1 1
      install/ubuntu/14.04/multiphp/apache2/PHP-56.tpl
  20. 1 1
      install/ubuntu/14.04/multiphp/apache2/PHP-70.tpl
  21. 1 1
      install/ubuntu/14.04/multiphp/apache2/PHP-71.tpl
  22. 1 1
      install/ubuntu/14.04/multiphp/apache2/PHP-72.tpl
  23. 1 1
      install/ubuntu/14.04/multiphp/apache2/PHP-73.tpl
  24. 1 1
      install/ubuntu/14.04/templates/web/apache2/basedir.tpl
  25. 1 1
      install/ubuntu/14.04/templates/web/apache2/default.tpl
  26. 1 1
      install/ubuntu/14.04/templates/web/apache2/hosting.tpl
  27. 1 1
      install/ubuntu/14.04/templates/web/apache2/phpcgi.tpl
  28. 1 1
      install/ubuntu/14.04/templates/web/apache2/phpfcgid.tpl
  29. 1 1
      install/ubuntu/16.04/multiphp/apache2/PHP-56.tpl
  30. 1 1
      install/ubuntu/16.04/multiphp/apache2/PHP-70.tpl
  31. 1 1
      install/ubuntu/16.04/multiphp/apache2/PHP-71.tpl
  32. 1 1
      install/ubuntu/16.04/multiphp/apache2/PHP-72.tpl
  33. 1 1
      install/ubuntu/16.04/multiphp/apache2/PHP-73.tpl
  34. 1 1
      install/ubuntu/16.04/templates/web/apache2/default.tpl
  35. 1 1
      install/ubuntu/16.04/templates/web/apache2/hosting.tpl
  36. 1 1
      install/ubuntu/16.04/templates/web/apache2/phpcgi.tpl
  37. 1 1
      install/ubuntu/16.04/templates/web/apache2/phpfcgid.tpl
  38. 1 1
      install/ubuntu/18.04/multiphp/apache2/PHP-56.tpl
  39. 1 1
      install/ubuntu/18.04/multiphp/apache2/PHP-70.tpl
  40. 1 1
      install/ubuntu/18.04/multiphp/apache2/PHP-71.tpl
  41. 1 1
      install/ubuntu/18.04/multiphp/apache2/PHP-72.tpl
  42. 1 1
      install/ubuntu/18.04/multiphp/apache2/PHP-73.tpl
  43. 1 1
      install/ubuntu/18.04/templates/web/apache2/default.tpl
  44. 1 1
      install/ubuntu/18.04/templates/web/apache2/hosting.tpl
  45. 1 1
      install/ubuntu/18.04/templates/web/apache2/phpcgi.tpl
  46. 1 1
      install/ubuntu/18.04/templates/web/apache2/phpfcgid.tpl

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
install/ubuntu/18.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

+ 1 - 1
install/ubuntu/18.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