Update file paths in templates to avoid conflicts

Kristan Kenney · Kristan Kenney · commit 0efa73207cca · 2019-04-15T01:11:30.000-03:00
diff --git a/install/deb/multiphp/apache2/PHP-56.stpl b/install/deb/multiphp/apache2/PHP-56.stpl
@@ -38,7 +38,7 @@
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
-    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf_*
 
 </VirtualHost>
 
diff --git a/install/deb/multiphp/apache2/PHP-56.tpl b/install/deb/multiphp/apache2/PHP-56.tpl
@@ -35,7 +35,7 @@
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
-    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf**
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_*
 
 </VirtualHost>
 
diff --git a/install/deb/multiphp/apache2/PHP-70.stpl b/install/deb/multiphp/apache2/PHP-70.stpl
@@ -38,7 +38,7 @@
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
-    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf_*
 
 </VirtualHost>
 
diff --git a/install/deb/multiphp/apache2/PHP-70.tpl b/install/deb/multiphp/apache2/PHP-70.tpl
@@ -35,7 +35,7 @@
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
-    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf**
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_*
 
 </VirtualHost>
 
diff --git a/install/deb/multiphp/apache2/PHP-71.stpl b/install/deb/multiphp/apache2/PHP-71.stpl
@@ -38,7 +38,7 @@
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
-    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf_*
 
 </VirtualHost>
 
diff --git a/install/deb/multiphp/apache2/PHP-71.tpl b/install/deb/multiphp/apache2/PHP-71.tpl
@@ -35,7 +35,7 @@
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
-    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf**
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_*
 
 </VirtualHost>
 
diff --git a/install/deb/multiphp/apache2/PHP-72.stpl b/install/deb/multiphp/apache2/PHP-72.stpl
@@ -38,7 +38,7 @@
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
-    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf_*
 
 </VirtualHost>
 
diff --git a/install/deb/multiphp/apache2/PHP-72.tpl b/install/deb/multiphp/apache2/PHP-72.tpl
@@ -35,7 +35,7 @@
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
-    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf**
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_*
 
 </VirtualHost>
 
diff --git a/install/deb/multiphp/apache2/PHP-73.stpl b/install/deb/multiphp/apache2/PHP-73.stpl
@@ -38,7 +38,7 @@
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
-    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf_*
 
 </VirtualHost>
 
diff --git a/install/deb/multiphp/apache2/PHP-73.tpl b/install/deb/multiphp/apache2/PHP-73.tpl
@@ -35,7 +35,7 @@
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 
-    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf**
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_*
 
 </VirtualHost>
 
diff --git a/install/deb/templates/web/apache2/default.stpl b/install/deb/templates/web/apache2/default.stpl
@@ -37,7 +37,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf_*
 
 </VirtualHost>
 
diff --git a/install/deb/templates/web/apache2/default.tpl b/install/deb/templates/web/apache2/default.tpl
@@ -34,7 +34,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf**
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_*
 
 </VirtualHost>
 
diff --git a/install/deb/templates/web/apache2/hosting.stpl b/install/deb/templates/web/apache2/hosting.stpl
@@ -43,7 +43,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf_*
 
 </VirtualHost>
 
diff --git a/install/deb/templates/web/apache2/hosting.tpl b/install/deb/templates/web/apache2/hosting.tpl
@@ -40,7 +40,7 @@
         AssignUserID %user% %group%
     </IfModule>
 
-    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf**
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_*
 
 </VirtualHost>
 
diff --git a/install/deb/templates/web/apache2/phpcgi.stpl b/install/deb/templates/web/apache2/phpcgi.stpl
@@ -32,7 +32,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf_*
 
 </VirtualHost>
 
diff --git a/install/deb/templates/web/apache2/phpcgi.tpl b/install/deb/templates/web/apache2/phpcgi.tpl
@@ -28,7 +28,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf**
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_*
 
 </VirtualHost>
 
diff --git a/install/deb/templates/web/apache2/phpfcgid.stpl b/install/deb/templates/web/apache2/phpfcgid.stpl
@@ -33,7 +33,7 @@
     SSLCertificateKeyFile %ssl_key%
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
-    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf*
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf_*
 
 </VirtualHost>
 
diff --git a/install/deb/templates/web/apache2/phpfcgid.tpl b/install/deb/templates/web/apache2/phpfcgid.tpl
@@ -28,7 +28,7 @@
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
-    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf**
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_*
 
 </VirtualHost>
 
diff --git a/install/deb/templates/web/nginx/caching.stpl b/install/deb/templates/web/nginx/caching.stpl
@@ -39,5 +39,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
+    include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
 }
diff --git a/install/deb/templates/web/nginx/caching.tpl b/install/deb/templates/web/nginx/caching.tpl
@@ -38,5 +38,5 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }
diff --git a/install/deb/templates/web/nginx/default.stpl b/install/deb/templates/web/nginx/default.stpl
@@ -30,6 +30,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
+    include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
 }
 
diff --git a/install/deb/templates/web/nginx/default.tpl b/install/deb/templates/web/nginx/default.tpl
@@ -29,6 +29,6 @@ server {
     location ~ /\.hg/   {return 404;}
     location ~ /\.bzr/  {return 404;}
 
-    include %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }
 
diff --git a/install/deb/templates/web/nginx/hosting.stpl b/install/deb/templates/web/nginx/hosting.stpl
@@ -32,6 +32,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/%domain%/nginx.ssl.conf*;
+    include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*;
 }
 
diff --git a/install/deb/templates/web/nginx/hosting.tpl b/install/deb/templates/web/nginx/hosting.tpl
@@ -31,6 +31,6 @@ server {
 
     disable_symlinks if_not_owner from=%docroot%;
 
-    include %home%/%user%/conf/web/%domain%/nginx.conf*;
+    include %home%/%user%/conf/web/%domain%/nginx.conf_*;
 }
 
