From e67f9ef215646b45c13048c546e48d70da4006e3 Mon Sep 17 00:00:00 2001 From: Jon Jensen Date: Thu, 23 Apr 2009 18:47:00 -0600 Subject: [PATCH 1/2] Most of the config was already ParseVariables Yes, so just do it once and simplify. --- catalog.cfg | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/catalog.cfg b/catalog.cfg index c77931a..4b1ee5e 100644 --- a/catalog.cfg +++ b/catalog.cfg @@ -1,3 +1,5 @@ +ParseVariables Yes + # File locations RunDir var/run ErrorFile var/log/error.log @@ -9,8 +11,6 @@ VariableDatabase site HTMLsuffix .itl -ParseVariables Yes - # Host configuration VendURL http://__SERVER_NAME____CGI_URL__ SecureURL https://__SERVER_NAME____CGI_URL__ @@ -72,9 +72,7 @@ UserDB default crypt 0 OrderCounter var/run/order.number # Jobs -ParseVariables Yes Jobs base_directory jobs Jobs email __JOBS_TO__ Jobs log var/log/jobs.log Jobs use_global 1 -ParseVariables No From d15e6f96994d34d530712fa202f026bf18e45dba Mon Sep 17 00:00:00 2001 From: Jon Jensen Date: Thu, 23 Apr 2009 18:47:33 -0600 Subject: [PATCH 2/2] Include only files with specific expected suffixes, and renamed profiles to *.profile. This helps prevent unwanted backups or other unexpected files from being loaded. --- catalog.cfg | 7 +++++-- profiles/{register => register.profile} | 0 2 files changed, 5 insertions(+), 2 deletions(-) rename profiles/{register => register.profile} (100%) diff --git a/catalog.cfg b/catalog.cfg index 4b1ee5e..a3cc4c2 100644 --- a/catalog.cfg +++ b/catalog.cfg @@ -18,10 +18,13 @@ MailOrderTo __ORDERS_TO__ ImageDir __IMAGE_URL__/ # Custom functions -include code/*.* +include code/*.action +include code/*.filter +include code/*.sub +include code/*.tag # Profiles -OrderProfile profiles/* +OrderProfile profiles/*.profile # Autoload Autoload init diff --git a/profiles/register b/profiles/register.profile similarity index 100% rename from profiles/register rename to profiles/register.profile