diff options
| -rw-r--r-- | catalog.cfg | 70 | ||||
| -rw-r--r-- | config/pikul_cost.tag | 2 |
2 files changed, 41 insertions, 31 deletions
diff --git a/catalog.cfg b/catalog.cfg index 45ad3be..8974467 100644 --- a/catalog.cfg +++ b/catalog.cfg @@ -31,11 +31,13 @@ VariableDatabase site # Warn if any important modules or usertags are missing. Require module Digest::MD5 "Need %s %s for better cache keys." +Require module Digest::Bcrypt "Required if you are going to use bcrypt passwords for UserDB." +Require module Crypt::Random "Required if you are going to use bcrypt passwords for UserDB." Require module Safe::Hole "Need %s %s for embedded perl object access." # Encoding Variable MV_UTF8 1 -Variable MV_HTTP_CHARSET utf-8 +Variable MV_HTTP_CHARSET UTF-8 #==========================================================================# @@ -48,6 +50,8 @@ ifdef LOGDIR ErrorFile __LOGDIR__/error.log AsciiTrack __LOGDIR__/tracking.asc #TrackFile __LOGDIR__/usertrack +ErrorDestination "Run jobs group=%s pid=%s" __LOGDIR__/jobs_run.log +ErrorDestination "Finished jobs group=%s pid=%s" __LOGDIR__/jobs_run.log endif ifndef LOGDIR @@ -127,7 +131,6 @@ endif # Set the image path for relative images ImageDir __IMAGE_DIR__/ -ImageDirInternal http://__SERVER_NAME____IMAGE_DIR__/ </ParseVariables> @@ -177,9 +180,12 @@ ifdef DEFAULT_LOCALE include dbconf/locales/{__LOCALES__}.cfg endif -Locale en_US currency_symbol Rp -Locale en_US mon_decimal_point "" -Locale en_US frac_digits 0 +Locale en_US <<EOL +{ + "Username already exists (indirect).", + "Sorry, that email is already associated with an account.", +} +EOL Locale id_ID currency_symbol Rp Locale id_ID p_cs_precedes 1 @@ -194,14 +200,13 @@ Locale id_ID frac_digits 0 ScratchDefault mv_add_dot_html 0 ScratchDefault mv_no_session_id 1 ScratchDefault mv_no_count 1 +Pragma url_no_session_id ifdef DEFAULT_COUNTRY ValuesDefault country __DEFAULT_COUNTRY__ ValuesDefault b_country __DEFAULT_COUNTRY__ endif -ValuesDefault fname Pengguna lname Baru - DirectoryIndex index.html SpecialPage catalog index SpecialPage violation ../special_pages/violation @@ -273,7 +278,7 @@ UserDB default from_plain 1 UserDB default bcrypt_pepper __BCRYPT_PEPPER__ # Set to 1 to make the username and password case-insensitive -UserDB default ignore_case 1 +UserDB default ignore_case 0 # Change a field to something that doesn't conflict in MySQL UserDB default time_field mod_time @@ -307,7 +312,6 @@ EOU UserDB default logfile logs/userdb.log # This makes the login username the user's email address -# Uncomment to use UserDB default indirect_login usernick UserDB default assign_username 1 @@ -357,6 +361,12 @@ AlwaysSecure <<EOD * EOD +AlwaysSecureGlob <<EOD + admin*, + cert*, + ui*, +EOD + ## Set this if you have a different secure server #AlwaysSecure order ord/basket process @@ -658,27 +668,25 @@ Shipping Postal default_geo 45056 Shipping QueryUPS default_geo 45056 Shipping default dir products/ship -#Database 2ndDayAir ship/2ndDayAir.csv CSV -#Database 2ndDayAirAM ship/2ndDayAirAM.csv CSV -#Database 3DaySelect ship/3DaySelect.csv CSV -#Database Expedited ship/Expedited.csv CSV -#Database Express ship/Express.csv CSV -#Database Ground ship/Ground.csv CSV -#Database NextDayAir ship/NextDayAir.csv CSV -#Database NextDayAirSaver ship/NextDayAirSaver.csv CSV -#Database Xarea ship/Xarea.csv CSV -#Database Zone ship/Zone.csv CSV -#Database usps ship/usps.txt TAB -#Database Book ship/Book.txt TAB -#Database Priority ship/Priority.txt TAB -#Database air_pp ship/air_pp.txt TAB -#Database surf_pp ship/surf_pp.txt TAB -#Database ups_cache ship/ups_cache.txt __SQLDSN__ -#Database ups_cache AUTO_SEQUENCE ups_cache_seq -#Database ups_cache DEFAULT_TYPE varchar(12) -#Database ups_cache INDEX weight origin zip shipmode country - -include usertag/*.tag +Database 2ndDayAir ship/2ndDayAir.csv CSV +Database 2ndDayAirAM ship/2ndDayAirAM.csv CSV +Database 3DaySelect ship/3DaySelect.csv CSV +Database Expedited ship/Expedited.csv CSV +Database Express ship/Express.csv CSV +Database Ground ship/Ground.csv CSV +Database NextDayAir ship/NextDayAir.csv CSV +Database NextDayAirSaver ship/NextDayAirSaver.csv CSV +Database Xarea ship/Xarea.csv CSV +Database Zone ship/Zone.csv CSV +Database usps ship/usps.txt TAB +Database Book ship/Book.txt TAB +Database Priority ship/Priority.txt TAB +Database air_pp ship/air_pp.txt TAB +Database surf_pp ship/surf_pp.txt TAB +Database ups_cache ship/ups_cache.txt __SQLDSN__ +Database ups_cache AUTO_SEQUENCE ups_cache_seq +Database ups_cache DEFAULT_TYPE varchar(12) +Database ups_cache INDEX weight origin zip shipmode country ## Uncomment MaxQuantityField inventory:quantity @@ -748,3 +756,5 @@ SearchProfile include/profiles/searchprofiles Jobs log __LOGDIR__/jobs.log Jobs base_directory etc/jobs + +Variable PIKUL_ANTERAJA 0 diff --git a/config/pikul_cost.tag b/config/pikul_cost.tag index da09040..b622eaf 100644 --- a/config/pikul_cost.tag +++ b/config/pikul_cost.tag @@ -3,7 +3,7 @@ UserTag pikul_cost Routine <<EOR sub { my ($company, $origin, $district, $city, $province, $weight, $service) = @_; my (@provisions, $table); - if ($company == 0) { + if ($company == $Global::Variable->{PIKUL_ANTERAJA}) { @provisions = ( "$Global::Variable->{ANTERAJA_BASE_PATH}", "$Global::Variable->{ANTERAJA_ACCESS_KEY_ID}", |