firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 14:43:03 +01:00
Code Issues

Renamed aliases.conf to databases.conf as suggested by Dmitry

Browse Source
This commit is contained in:
alexpeshkoff 2013-04-08 16:28:05 +00:00
parent 931b31c444
commit b3c33aeeb6
26 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builds/install/arch-specific/aix/classic/makeInstallImage.sh.in
View File

@ -209,7 +209,7 @@ copyFiles() {
# Misc config files # Misc config files
cp $BuildRootDir/gen/install/misc/firebird.conf $DestDir/ cp $BuildRootDir/gen/install/misc/firebird.conf $DestDir/
cp $BuildRootDir/gen/install/misc/aliases.conf $DestDir/ cp $BuildRootDir/gen/install/misc/databases.conf $DestDir/
cp $BuildRootDir/gen/install/misc/fbintl.conf $DestDir/intl/ cp $BuildRootDir/gen/install/misc/fbintl.conf $DestDir/intl/
# Create links from @libdir@ to install area. # Create links from @libdir@ to install area.

8
builds/install/arch-specific/darwin/install-script
View File

@ -240,10 +240,10 @@ if test -f /tmp/fb-security-database-update2.fdb; then
rm -f /tmp/fb-security-database-update2.fdb rm -f /tmp/fb-security-database-update2.fdb
fi fi
#Install the saved aliases.conf, if any #Install the saved databases.conf, if any
echo "Install the saved aliases.conf file" echo "Install the saved databases.conf file"
if test -f /tmp/fb-aliases.conf; then if test -f /tmp/fb-databases.conf; then
mv -f /tmp/fb-aliases.conf "$FB_RES/English.lproj/var/aliases.conf" mv -f /tmp/fb-databases.conf "$FB_RES/English.lproj/var/databases.conf"
fi fi
#Install the saved UDF libraries, if any #Install the saved UDF libraries, if any

4
builds/install/arch-specific/darwin/preupgrade-script
View File

@ -18,8 +18,8 @@ fi
if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/security2.fdb"; then if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/security2.fdb"; then
mv -f "$FB_FW/Versions/A/Resources/English.lproj/var/security2.fdb" /tmp/fb-security-database-update2.fdb mv -f "$FB_FW/Versions/A/Resources/English.lproj/var/security2.fdb" /tmp/fb-security-database-update2.fdb
fi fi
if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/aliases.conf"; then if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/databases.conf"; then
mv -f "$FB_FW/Versions/A/Resources/English.lproj/var/aliases.conf" /tmp/fb-aliases.conf mv -f "$FB_FW/Versions/A/Resources/English.lproj/var/databases.conf" /tmp/fb-databases.conf
fi fi
for i in /Library/Frameworks/Firebird.framework/Resources/English.lproj/var/UDF/*;do for i in /Library/Frameworks/Firebird.framework/Resources/English.lproj/var/UDF/*;do

2
builds/install/arch-specific/freebsd/install.sh.in
View File

@ -301,7 +301,7 @@ copyFiles() {
#conf #conf
cp $BuiltFBDir/firebird.conf ${TargetDir}@FB_CONFDIR@ cp $BuiltFBDir/firebird.conf ${TargetDir}@FB_CONFDIR@
cp $BuiltFBDir/aliases.conf ${TargetDir}@FB_CONFDIR@ cp $BuiltFBDir/databases.conf ${TargetDir}@FB_CONFDIR@
cp $BuiltFBDir/fbtrace.conf ${TargetDir}@FB_CONFDIR@ cp $BuiltFBDir/fbtrace.conf ${TargetDir}@FB_CONFDIR@
chown root:wheel ${TargetDir}@FB_CONFDIR@/*.conf chown root:wheel ${TargetDir}@FB_CONFDIR@/*.conf

2
builds/install/arch-specific/hpux/classic/firebirdCS.psf.in
View File

@ -27,7 +27,7 @@ fileset
tag main tag main
file -u 0660 -g firebird -o firebird buildroot@prefix@/security2.fdb @prefix@/security2.fdb file -u 0660 -g firebird -o firebird buildroot@prefix@/security2.fdb @prefix@/security2.fdb
file -u 0644 -g firebird -o firebird buildroot@prefix@/firebird.conf @prefix@/firebird.conf file -u 0644 -g firebird -o firebird buildroot@prefix@/firebird.conf @prefix@/firebird.conf
file -u 0644 -g firebird -o firebird buildroot@prefix@/aliases.conf @prefix@/aliases.conf file -u 0644 -g firebird -o firebird buildroot@prefix@/databases.conf @prefix@/databases.conf
file -u 0644 -g firebird -o firebird buildroot@prefix@/WhatsNew @prefix@/WhatsNew file -u 0644 -g firebird -o firebird buildroot@prefix@/WhatsNew @prefix@/WhatsNew
end end
# #

2
builds/install/arch-specific/hpux/classic/makeinstallImage.sh.in
View File

@ -206,7 +206,7 @@ copyFiles() {
# Misc config files # Misc config files
cp $BuildRootDir/gen/install/misc/firebird.conf $DestDir/ cp $BuildRootDir/gen/install/misc/firebird.conf $DestDir/
cp $BuildRootDir/gen/install/misc/aliases.conf $DestDir/ cp $BuildRootDir/gen/install/misc/databases.conf $DestDir/
cp $BuildRootDir/gen/install/misc/fbintl.conf $DestDir/intl/ cp $BuildRootDir/gen/install/misc/fbintl.conf $DestDir/intl/
# Create links from @libdir@ to install area. # Create links from @libdir@ to install area.

4
builds/install/arch-specific/hpux/misc/createaliasDB.sh.in
View File

@ -51,7 +51,7 @@ AskQuestion() {
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# appendAliasEntry # appendAliasEntry
# check to see if an entry already exists in the aliases.conf file # check to see if an entry already exists in the databases.conf file
# if it doesn't append it to the end of the file # if it doesn't append it to the end of the file
appendAliasEntry() { appendAliasEntry() {
@ -138,7 +138,7 @@ checkAccessToFile() {
aliasName=$1 aliasName=$1
newDB=$2 newDB=$2
AliasFile=@FB_CONFDIR@/aliases.conf AliasFile=@FB_CONFDIR@/databases.conf
checkNameStartsWithSlash $newDB checkNameStartsWithSlash $newDB

2
builds/install/arch-specific/hpux/super/makeinstallImage.sh.in
View File

@ -169,7 +169,7 @@ copyFiles() {
# Miscellaneous config and stratup files # Miscellaneous config and stratup files
cp $BuildRootDir/gen/install/misc/firebird.conf $DestDir/firebird.conf cp $BuildRootDir/gen/install/misc/firebird.conf $DestDir/firebird.conf
cp $BuildRootDir/gen/install/misc/aliases.conf $DestDir/ cp $BuildRootDir/gen/install/misc/databases.conf $DestDir/
# Create links from /usr/lib to install area. # Create links from /usr/lib to install area.

2
builds/install/arch-specific/linux/misc/makeInstallImage.sh.in
View File

@ -304,7 +304,7 @@ copyFiles() {
#conf #conf
cp $BuiltFBDir/firebird.conf ${TargetDir}@FB_CONFDIR@ cp $BuiltFBDir/firebird.conf ${TargetDir}@FB_CONFDIR@
cp $BuiltFBDir/aliases.conf ${TargetDir}@FB_CONFDIR@ cp $BuiltFBDir/databases.conf ${TargetDir}@FB_CONFDIR@
cp $BuiltFBDir/fbtrace.conf ${TargetDir}@FB_CONFDIR@ cp $BuiltFBDir/fbtrace.conf ${TargetDir}@FB_CONFDIR@
cp $BuiltFBDir/plugins.conf ${TargetDir}@FB_CONFDIR@ cp $BuiltFBDir/plugins.conf ${TargetDir}@FB_CONFDIR@

18
builds/install/arch-specific/netbsd/install.sh.in
View File

@ -197,14 +197,14 @@ cp ${SQLEXTENSIONS} $DestDir/doc/sql.extensions || exit
cp $BuiltFBDir/misc/firebird.conf $DestDir/firebird.conf.sample || exit cp $BuiltFBDir/misc/firebird.conf $DestDir/firebird.conf.sample || exit
echo "#" >> $DestDir/aliases.conf.sample echo "#" >> $DestDir/databases.conf.sample
echo "# List of known database aliases" >> $DestDir/aliases.conf.sample echo "# List of known database aliases" >> $DestDir/databases.conf.sample
echo "# ------------------------------" >> $DestDir/aliases.conf.sample echo "# ------------------------------" >> $DestDir/databases.conf.sample
echo "#" >> $DestDir/aliases.conf.sample echo "#" >> $DestDir/databases.conf.sample
echo "# Examples:" >> $DestDir/aliases.conf.sample echo "# Examples:" >> $DestDir/databases.conf.sample
echo "#" >> $DestDir/aliases.conf.sample echo "#" >> $DestDir/databases.conf.sample
echo "# employee = /$DestDir/examples/employee.fdb" >> $DestDir/aliases.conf.sample echo "# employee = /$DestDir/examples/employee.fdb" >> $DestDir/databases.conf.sample
echo "#" >> $DestDir/aliases.conf.sample echo "#" >> $DestDir/databases.conf.sample
echo Setting ownership and permissions on installed files echo Setting ownership and permissions on installed files
@ -284,7 +284,7 @@ chmod ug=rw,o= examples/*.fdb || exit
chmod ug=rw,o= help/*.fdb || exit chmod ug=rw,o= help/*.fdb || exit
# install the samples if they don't exist # install the samples if they don't exist
[ -f aliases.conf ] || install -o firebird -g firebird -m 440 aliases.conf.sample aliases.conf [ -f databases.conf ] || install -o firebird -g firebird -m 440 databases.conf.sample databases.conf
[ -f firebird.conf ] || install -o firebird -g firebird -m 440 firebird.conf.sample firebird.conf [ -f firebird.conf ] || install -o firebird -g firebird -m 440 firebird.conf.sample firebird.conf
[ -f security2.fdb ] || install -o firebird -g firebird -m 660 security2.fdb.sample security2.fdb [ -f security2.fdb ] || install -o firebird -g firebird -m 660 security2.fdb.sample security2.fdb

2
builds/install/arch-specific/solaris/CS/prototype.in
View File

@ -18,7 +18,7 @@ d none @prefix@ 0751 firebird firebird
v CONFIG.prsv @prefix@/security2.fdb=$SRCDIR/security2.fdb 0660 firebird firebird v CONFIG.prsv @prefix@/security2.fdb=$SRCDIR/security2.fdb 0660 firebird firebird
v CONFIG.prsv @prefix@/firebird.conf=$SRCDIR/misc/firebird.conf 0444 firebird firebird v CONFIG.prsv @prefix@/firebird.conf=$SRCDIR/misc/firebird.conf 0444 firebird firebird
v CONFIG.prsv @prefix@/aliases.conf=$SRCDIR/../../builds/install/misc/aliases.conf.in 0444 firebird firebird v CONFIG.prsv @prefix@/databases.conf=$SRCDIR/../../builds/install/misc/databases.conf.in 0444 firebird firebird
v CONFIG.prsv @prefix@/intl/fbintl.conf=$SRCDIR/misc/fbintl.conf 0644 firebird firebird v CONFIG.prsv @prefix@/intl/fbintl.conf=$SRCDIR/misc/fbintl.conf 0644 firebird firebird
f none @prefix@/WhatsNew=$SRCDIR/../../doc/WhatsNew 0644 firebird firebird f none @prefix@/WhatsNew=$SRCDIR/../../doc/WhatsNew 0644 firebird firebird

2
builds/install/arch-specific/solaris/SS/prototype.in
View File

@ -18,7 +18,7 @@ d none @prefix@ 0755 firebird firebird
v CONFIG.prsv @prefix@/security2.fdb=$SRCDIR/security2.fdb 0660 firebird firebird v CONFIG.prsv @prefix@/security2.fdb=$SRCDIR/security2.fdb 0660 firebird firebird
v CONFIG.prsv @prefix@/firebird.conf=$SRCDIR/misc/firebird.conf 0644 firebird firebird v CONFIG.prsv @prefix@/firebird.conf=$SRCDIR/misc/firebird.conf 0644 firebird firebird
v CONFIG.prsv @prefix@/aliases.conf=$SRCDIR/../../builds/install/misc/aliases.conf.in 0544 firebird firebird v CONFIG.prsv @prefix@/databases.conf=$SRCDIR/../../builds/install/misc/databases.conf.in 0544 firebird firebird
v CONFIG.prsv @prefix@/intl/fbintl.conf=$SRCDIR/misc/fbintl.conf 0644 firebird firebird v CONFIG.prsv @prefix@/intl/fbintl.conf=$SRCDIR/misc/fbintl.conf 0644 firebird firebird
f none @prefix@/WhatsNew=$SRCDIR/../../doc/WhatsNew 0644 firebird firebird f none @prefix@/WhatsNew=$SRCDIR/../../doc/WhatsNew 0644 firebird firebird

20
builds/install/arch-specific/win32/BuildExecutableInstall.bat
View File

@ -441,15 +441,15 @@ endlocal
:ALIAS_CONF :ALIAS_CONF
:: Generate a sample aliases file :: Generate a sample aliases file
::=============================== ::===============================
@echo Creating sample aliases.conf @echo Creating sample databases.conf
@echo # > %FB_OUTPUT_DIR%\aliases.conf @echo # > %FB_OUTPUT_DIR%\databases.conf
@echo # List of known database aliases >> %FB_OUTPUT_DIR%\aliases.conf @echo # List of known database aliases >> %FB_OUTPUT_DIR%\databases.conf
@echo # ------------------------------ >> %FB_OUTPUT_DIR%\aliases.conf @echo # ------------------------------ >> %FB_OUTPUT_DIR%\databases.conf
@echo # >> %FB_OUTPUT_DIR%\aliases.conf @echo # >> %FB_OUTPUT_DIR%\databases.conf
@echo # Examples: >> %FB_OUTPUT_DIR%\aliases.conf @echo # Examples: >> %FB_OUTPUT_DIR%\databases.conf
@echo # >> %FB_OUTPUT_DIR%\aliases.conf @echo # >> %FB_OUTPUT_DIR%\databases.conf
@echo # dummy = c:\data\dummy.fdb >> %FB_OUTPUT_DIR%\aliases.conf @echo # dummy = c:\data\dummy.fdb >> %FB_OUTPUT_DIR%\databases.conf
@echo # >> %FB_OUTPUT_DIR%\aliases.conf @echo # >> %FB_OUTPUT_DIR%\databases.conf
::End of ALIAS_CONF ::End of ALIAS_CONF
::----------------- ::-----------------
@ -585,7 +585,7 @@ set FBBUILD_EMB_PACK_ROOT=%FB_ROOT_PATH%\builds\emb_pack_%FB_TARGET_PLATFORM%
@mkdir %FBBUILD_EMB_PACK_ROOT% 2>nul @mkdir %FBBUILD_EMB_PACK_ROOT% 2>nul
@del /s /q %FBBUILD_EMB_PACK_ROOT%\ > nul @del /s /q %FBBUILD_EMB_PACK_ROOT%\ > nul
for %%v in (aliases.conf firebird.conf firebird.msg) do ( @copy /Y %FB_OUTPUT_DIR%\%%v %FBBUILD_EMB_PACK_ROOT%\%%v > nul) for %%v in (databases.conf firebird.conf firebird.msg) do ( @copy /Y %FB_OUTPUT_DIR%\%%v %FBBUILD_EMB_PACK_ROOT%\%%v > nul)
for %%v in ( doc intl udf ) do (@mkdir %FBBUILD_EMB_PACK_ROOT%\%%v 2>nul) for %%v in ( doc intl udf ) do (@mkdir %FBBUILD_EMB_PACK_ROOT%\%%v 2>nul)

2
builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc
View File

@ -736,7 +736,7 @@ if UsingWinNT then
else else
SharedFileArray[26].Filename := ExpandConstant('{sys}')+'FIREBI~1.CPL'; SharedFileArray[26].Filename := ExpandConstant('{sys}')+'FIREBI~1.CPL';
SharedFileArray[27].Filename := ExpandConstant('{app}')+'aliases.conf'; SharedFileArray[27].Filename := ExpandConstant('{app}')+'databases.conf';
SharedFileArray[28].Filename := ExpandConstant('{app}')+'firebird.conf'; SharedFileArray[28].Filename := ExpandConstant('{app}')+'firebird.conf';
SharedFileArray[29].Filename := ExpandConstant('{app}')+'firebird.log'; SharedFileArray[29].Filename := ExpandConstant('{app}')+'firebird.log';
SharedFileArray[30].Filename := ExpandConstant('{app}')+'security3.fdb'; SharedFileArray[30].Filename := ExpandConstant('{app}')+'security3.fdb';

10
builds/install/arch-specific/win32/FirebirdInstall_30.iss
View File

@ -494,7 +494,7 @@ Source: {#FilesDir}\firebird.conf; DestDir: {app}; DestName: firebird.conf.defau
Source: {#FilesDir}\firebird.conf; DestDir: {app}; DestName: firebird.conf; Components: ServerComponent; Flags: uninsneveruninstall; check: NoFirebirdConfExists Source: {#FilesDir}\firebird.conf; DestDir: {app}; DestName: firebird.conf; Components: ServerComponent; Flags: uninsneveruninstall; check: NoFirebirdConfExists
Source: {#FilesDir}\fbtrace.conf; DestDir: {app}; DestName: fbtrace.conf.default; Components: ServerComponent; Source: {#FilesDir}\fbtrace.conf; DestDir: {app}; DestName: fbtrace.conf.default; Components: ServerComponent;
Source: {#FilesDir}\fbtrace.conf; DestDir: {app}; DestName: fbtrace.conf; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist; check: NofbtraceConfExists; Source: {#FilesDir}\fbtrace.conf; DestDir: {app}; DestName: fbtrace.conf; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist; check: NofbtraceConfExists;
Source: {#FilesDir}\aliases.conf; DestDir: {app}; Components: ClientComponent; Flags: uninsneveruninstall onlyifdoesntexist Source: {#FilesDir}\databases.conf; DestDir: {app}; Components: ClientComponent; Flags: uninsneveruninstall onlyifdoesntexist
Source: {#FilesDir}\security3.fdb; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist Source: {#FilesDir}\security3.fdb; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist
Source: {#FilesDir}\firebird.msg; DestDir: {app}; Components: ClientComponent; Flags: sharedfile ignoreversion Source: {#FilesDir}\firebird.msg; DestDir: {app}; Components: ClientComponent; Flags: sharedfile ignoreversion
Source: {#FilesDir}\firebird.log; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall skipifsourcedoesntexist external dontcopy Source: {#FilesDir}\firebird.log; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall skipifsourcedoesntexist external dontcopy
@ -665,7 +665,7 @@ Var
// Options for scripted uninstall. // Options for scripted uninstall.
CleanUninstall: Boolean; // If /clean is passed to the uninstaller it will delete CleanUninstall: Boolean; // If /clean is passed to the uninstaller it will delete
// user config files - firebird.conf, firebird.log, // user config files - firebird.conf, firebird.log,
// aliases.conf, fbtrace.conf and the security database. // databases.conf, fbtrace.conf and the security database.
SYSDBAName: String; // Name of SYSDBA SYSDBAName: String; // Name of SYSDBA
SYSDBAPassword: String; // SYSDBA password SYSDBAPassword: String; // SYSDBA password
@ -1056,7 +1056,7 @@ begin
//Manually set the sharedfile count of these files. //Manually set the sharedfile count of these files.
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\firebird.conf', false); IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\firebird.conf', false);
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\firebird.log', false); IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\firebird.log', false);
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\aliases.conf', false); IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\databases.conf', false);
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\fbtrace.conf', false); IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\fbtrace.conf', false);
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\security3.fdb', false); IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\security3.fdb', false);
end; end;
@ -1168,9 +1168,9 @@ begin
if CleanUninstall then if CleanUninstall then
DeleteFile(GetAppPath+'\firebird.log'); DeleteFile(GetAppPath+'\firebird.log');
if DecrementSharedCount(Is64BitInstallMode, GetAppPath+'\aliases.conf') then if DecrementSharedCount(Is64BitInstallMode, GetAppPath+'\databases.conf') then
if CleanUninstall then if CleanUninstall then
DeleteFile(GetAppPath+'\aliases.conf'); DeleteFile(GetAppPath+'\databases.conf');
if DecrementSharedCount(Is64BitInstallMode, GetAppPath+'\fbtrace.conf') then if DecrementSharedCount(Is64BitInstallMode, GetAppPath+'\fbtrace.conf') then
if CleanUninstall then if CleanUninstall then

2
builds/install/arch-specific/win32/installation_readme.txt
View File

@ -130,7 +130,7 @@ o If Firebird is running as an application (instead of
o Uninstallation leaves five files in the install o Uninstallation leaves five files in the install
directory: directory:
- aliases.conf - databases.conf
- firebird.conf - firebird.conf
- fbtrace.conf - fbtrace.conf
- firebird.log - firebird.log

2
builds/install/arch-specific/win32/installation_scripted.txt
View File

@ -398,7 +398,7 @@ Parameters specific to Firebird uninstalls
the uninstallation process has completed: the uninstallation process has completed:
firebird.conf firebird.conf
aliases.conf databases.conf
firebird.log firebird.log
security3.fdb security3.fdb
fbtrace.conf fbtrace.conf

4
builds/install/misc/createAliasDB.sh.in
View File

@ -36,7 +36,7 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# appendAliasEntry # appendAliasEntry
# check to see if an entry already exists in the aliases.conf file # check to see if an entry already exists in the databases.conf file
# if it doesn't append it to the end of the file # if it doesn't append it to the end of the file
appendAliasEntry() { appendAliasEntry() {
@ -121,7 +121,7 @@ checkAccessToFile() {
aliasName=$1 aliasName=$1
newDB=$2 newDB=$2
AliasFile=@FB_CONFDIR@/aliases.conf AliasFile=@FB_CONFDIR@/databases.conf
checkNameStartsWithSlash $newDB checkNameStartsWithSlash $newDB
appendAliasEntry $aliasName $newDB appendAliasEntry $aliasName $newDB

0
builds/install/misc/aliases.conf.in → builds/install/misc/databases.conf.in
View File

2
builds/install/misc/firebird.conf.in
View File

@ -70,7 +70,7 @@
# To specify access to specific trees, enum all required paths # To specify access to specific trees, enum all required paths
# (for Win32 this may be something like 'C:\DataBase;D:\Mirror', # (for Win32 this may be something like 'C:\DataBase;D:\Mirror',
# for unix - '/db;/mnt/mirrordb'). If you choose 'None', then only # for unix - '/db;/mnt/mirrordb'). If you choose 'None', then only
# databases listed in aliases.conf can be attached. # databases listed in databases.conf can be attached.
# #
# Note: simple quotation marks shown above should *NOT* be used when # Note: simple quotation marks shown above should *NOT* be used when
# specifying values and directory path names. Examples: # specifying values and directory path names. Examples:

8
builds/posix/postfix.darwin
View File

@ -105,8 +105,8 @@ darwin_finish_cs_framework:
cp ../builds/install/arch-specific/darwin/Readme.txt \ cp ../builds/install/arch-specific/darwin/Readme.txt \
$(FB_FW)/Resources/Readme.txt $(FB_FW)/Resources/Readme.txt
cp ../gen/install/misc/firebird.conf $(FB_FW)/Resources/English.lproj/var cp ../gen/install/misc/firebird.conf $(FB_FW)/Resources/English.lproj/var
cp ../builds/install/arch-specific/darwin/aliases.conf.in \ cp ../builds/install/arch-specific/darwin/databases.conf.in \
$(FB_FW)/Resources/English.lproj/var/aliases.conf $(FB_FW)/Resources/English.lproj/var/databases.conf
cp ../src/utilities/ntrace/fbtrace.conf \ cp ../src/utilities/ntrace/fbtrace.conf \
$(FB_FW)/Resources/English.lproj/var/fbtrace.conf $(FB_FW)/Resources/English.lproj/var/fbtrace.conf
@ -171,8 +171,8 @@ darwin_finish_ss_framework:
cp ../builds/install/arch-specific/darwin/Readme.txt \ cp ../builds/install/arch-specific/darwin/Readme.txt \
$(FB_FW)/Resources/Readme.txt $(FB_FW)/Resources/Readme.txt
cp ../gen/install/misc/firebird.conf $(FB_FW)/Resources/English.lproj/var cp ../gen/install/misc/firebird.conf $(FB_FW)/Resources/English.lproj/var
cp ../builds/install/arch-specific/darwin/aliases.conf.in \ cp ../builds/install/arch-specific/darwin/databases.conf.in \
$(FB_FW)/Resources/English.lproj/var/aliases.conf $(FB_FW)/Resources/English.lproj/var/databases.conf
cp ../src/utilities/ntrace/fbtrace.conf \ cp ../src/utilities/ntrace/fbtrace.conf \
$(FB_FW)/Resources/English.lproj/var/fbtrace.conf $(FB_FW)/Resources/English.lproj/var/fbtrace.conf
darwin_postbuild_target: package darwin_postbuild_target: package

2
configure.ac
View File

@ -1114,7 +1114,7 @@ dnl TODO: fix "arch-specific/linux/" paths for common posix scripts with SVN
for fb_tgt in $FB_TARGETS; do for fb_tgt in $FB_TARGETS; do
AC_CONFIG_FILES([ AC_CONFIG_FILES([
gen/$fb_tgt/firebird/firebird.conf:builds/install/misc/firebird.conf.in gen/$fb_tgt/firebird/firebird.conf:builds/install/misc/firebird.conf.in
gen/$fb_tgt/firebird/aliases.conf:builds/install/misc/aliases.conf.in gen/$fb_tgt/firebird/databases.conf:builds/install/misc/databases.conf.in
gen/$fb_tgt/firebird/fbtrace.conf:src/utilities/ntrace/fbtrace.conf gen/$fb_tgt/firebird/fbtrace.conf:src/utilities/ntrace/fbtrace.conf
gen/$fb_tgt/firebird/intl/fbintl.conf:builds/install/misc/fbintl.conf gen/$fb_tgt/firebird/intl/fbintl.conf:builds/install/misc/fbintl.conf
gen/$fb_tgt/firebird/plugins.conf:builds/install/misc/plugins.conf gen/$fb_tgt/firebird/plugins.conf:builds/install/misc/plugins.conf

2
doc/README.raw_devices
View File

@ -74,6 +74,6 @@ Database header page information:
In all other aspects raw devices do not have known specific In all other aspects raw devices do not have known specific
in use. in use.
Tip: it's good idea to have raw devices in aliases.conf - in Tip: it's good idea to have raw devices in databases.conf - in
case of HW reconfiguration of your server you will not need to case of HW reconfiguration of your server you will not need to
change connection strings. change connection strings.

2
doc/install_windows_manually.txt
View File

@ -81,7 +81,7 @@ Uninstallation
instclient.exe remove <libname> instclient.exe remove <libname>
- Delete installation directory. You may wish to keep the log file, security - Delete installation directory. You may wish to keep the log file, security
database, firebird.conf and aliases.conf. database, firebird.conf and databases.conf.

14
src/common/db_alias.cpp
View File

@ -54,7 +54,7 @@ namespace
}; };
InitInstance<DatabaseDirectoryList> databaseDirectoryList; InitInstance<DatabaseDirectoryList> databaseDirectoryList;
const char* const ALIAS_FILE = "aliases.conf"; const char* const ALIAS_FILE = "databases.conf";
void replace_dir_sep(PathName& s) void replace_dir_sep(PathName& s)
{ {
@ -272,8 +272,8 @@ static inline bool hasSeparator(const PathName& name)
return false; return false;
} }
// Search for 'alias' in aliases.conf, return its value in 'file' if found. Else set file to alias. // Search for 'alias' in databases.conf, return its value in 'file' if found. Else set file to alias.
// Returns true if alias is found in aliases.conf. // Returns true if alias is found in databases.conf.
static bool resolveAlias(const PathName& alias, PathName& file, RefPtr<Config>* config) static bool resolveAlias(const PathName& alias, PathName& file, RefPtr<Config>* config)
{ {
PathName correctedAlias = alias; PathName correctedAlias = alias;
@ -346,7 +346,7 @@ static bool setPath(const PathName& filename, PathName& expandedName)
} }
// Full processing of database name // Full processing of database name
// Returns true if alias was found in aliases.conf // Returns true if alias was found in databases.conf
bool expandDatabaseName(const Firebird::PathName& alias, bool expandDatabaseName(const Firebird::PathName& alias,
Firebird::PathName& file, Firebird::PathName& file,
Firebird::RefPtr<Config>* config) Firebird::RefPtr<Config>* config)
@ -357,13 +357,13 @@ bool expandDatabaseName(const Firebird::PathName& alias,
} }
catch (const fatal_exception& ex) catch (const fatal_exception& ex)
{ {
gds__log("File aliases.conf contains bad data: %s", ex.what()); gds__log("File databases.conf contains bad data: %s", ex.what());
(Arg::Gds(isc_random) << "Server misconfigured - contact administrator please").raise(); (Arg::Gds(isc_random) << "Server misconfigured - contact administrator please").raise();
} }
ReadLockGuard guard(aliasesConf().rwLock, "expandDatabaseName"); ReadLockGuard guard(aliasesConf().rwLock, "expandDatabaseName");
// First of all check in aliases.conf // First of all check in databases.conf
if (resolveAlias(alias, file, config)) if (resolveAlias(alias, file, config))
{ {
return true; return true;
@ -390,7 +390,7 @@ bool expandDatabaseName(const Firebird::PathName& alias,
} }
} }
// Search for correct config in aliases.conf // Search for correct config in databases.conf
if (config) if (config)
{ {
DbName* db = aliasesConf().dbHash.lookup(file); DbName* db = aliasesConf().dbHash.lookup(file);

4
src/yvalve/PluginManager.cpp
View File

@ -395,7 +395,7 @@ namespace
PluginModule* builtin = NULL; PluginModule* builtin = NULL;
// Provides most of configuration services for plugins, // Provides most of configuration services for plugins,
// except per-database configuration in aliases.conf // except per-database configuration in databases.conf
class ConfiguredPlugin : public RefCntIface<ITimer, FB_TIMER_VERSION> class ConfiguredPlugin : public RefCntIface<ITimer, FB_TIMER_VERSION>
{ {
public: public:
@ -472,7 +472,7 @@ namespace
PathName plugName; PathName plugName;
}; };
// Provides per-database configuration from aliases.conf. // Provides per-database configuration from databases.conf.
class FactoryParameter : public RefCntIface<IPluginConfig, FB_PLUGIN_CONFIG_VERSION> class FactoryParameter : public RefCntIface<IPluginConfig, FB_PLUGIN_CONFIG_VERSION>
{ {
public: public: