kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Permit custom locations for astdb and the keys directory (though default to the current locations) (Closes issue #10267)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83726 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2007-09-24 22:06:19 +00:00
parent 463cda30cf
commit ddc6f8100e
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@@ -108,6 +108,8 @@ ifeq ($(OSARCH),SunOS)
ASTETCDIR=/var/etc/asterisk ASTETCDIR=/var/etc/asterisk
ASTLIBDIR=/opt/asterisk/lib ASTLIBDIR=/opt/asterisk/lib
ASTVARLIBDIR=/var/opt/asterisk ASTVARLIBDIR=/var/opt/asterisk
ASTDBDIR=$(ASTVARLIBDIR)
ASTKEYDIR=$(ASTVARLIBDIR)
ASTSPOOLDIR=/var/spool/asterisk ASTSPOOLDIR=/var/spool/asterisk
ASTLOGDIR=/var/log/asterisk ASTLOGDIR=/var/log/asterisk
ASTHEADERDIR=/opt/asterisk/include ASTHEADERDIR=/opt/asterisk/include
@@ -128,9 +130,12 @@ else
ifneq ($(findstring BSD,$(OSARCH)),) ifneq ($(findstring BSD,$(OSARCH)),)
ASTVARLIBDIR=$(prefix)/share/asterisk ASTVARLIBDIR=$(prefix)/share/asterisk
ASTVARRUNDIR=$(localstatedir)/run/asterisk ASTVARRUNDIR=$(localstatedir)/run/asterisk
ASTDBDIR=$(localstatedir)/db/asterisk
else else
ASTVARLIBDIR=$(localstatedir)/lib/asterisk ASTVARLIBDIR=$(localstatedir)/lib/asterisk
ASTDBDIR=$(ASTVARLIBDIR)
endif endif
ASTKEYDIR=$(ASTVARLIBDIR)
endif endif
ifeq ($(ASTDATADIR),) ifeq ($(ASTDATADIR),)
ASTDATADIR:=$(ASTVARLIBDIR) ASTDATADIR:=$(ASTVARLIBDIR)
@@ -556,6 +561,8 @@ samples: adsi
echo "astetcdir => $(ASTETCDIR)" ; \ echo "astetcdir => $(ASTETCDIR)" ; \
echo "astmoddir => $(MODULES_DIR)" ; \ echo "astmoddir => $(MODULES_DIR)" ; \
echo "astvarlibdir => $(ASTVARLIBDIR)" ; \ echo "astvarlibdir => $(ASTVARLIBDIR)" ; \
echo "astdbdir => $(ASTDBDIR)" ; \
echo "astkeydir => $(ASTKEYDIR)" ; \
echo "astdatadir => $(ASTDATADIR)" ; \ echo "astdatadir => $(ASTDATADIR)" ; \
echo "astagidir => $(AGI_DIR)" ; \ echo "astagidir => $(AGI_DIR)" ; \
echo "astspooldir => $(ASTSPOOLDIR)" ; \ echo "astspooldir => $(ASTSPOOLDIR)" ; \

12
main/asterisk.c
View File

@@ -2301,6 +2301,10 @@ static void ast_readconfig(void)
char *config = AST_CONFIG_FILE; char *config = AST_CONFIG_FILE;
char hostname[MAXHOSTNAMELEN] = ""; char hostname[MAXHOSTNAMELEN] = "";
struct ast_flags config_flags = { 0 }; struct ast_flags config_flags = { 0 };
struct {
unsigned int dbdir:1;
unsigned int keydir:1;
} found = { 0, 0 };
if (ast_opt_override_config) { if (ast_opt_override_config) {
cfg = ast_config_load(ast_config_AST_CONFIG_FILE, config_flags); cfg = ast_config_load(ast_config_AST_CONFIG_FILE, config_flags);
@@ -2348,10 +2352,18 @@ static void ast_readconfig(void)
snprintf(ast_config_AST_MONITOR_DIR, sizeof(ast_config_AST_MONITOR_DIR) - 1, "%s/monitor", v->value); snprintf(ast_config_AST_MONITOR_DIR, sizeof(ast_config_AST_MONITOR_DIR) - 1, "%s/monitor", v->value);
} else if (!strcasecmp(v->name, "astvarlibdir")) { } else if (!strcasecmp(v->name, "astvarlibdir")) {
ast_copy_string(ast_config_AST_VAR_DIR, v->value, sizeof(ast_config_AST_VAR_DIR)); ast_copy_string(ast_config_AST_VAR_DIR, v->value, sizeof(ast_config_AST_VAR_DIR));
if (!found.dbdir)
snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), "%s/astdb", v->value); snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), "%s/astdb", v->value);
} else if (!strcasecmp(v->name, "astdbdir")) {
snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), "%s/astdb", v->value);
found.dbdir = 1;
} else if (!strcasecmp(v->name, "astdatadir")) { } else if (!strcasecmp(v->name, "astdatadir")) {
ast_copy_string(ast_config_AST_DATA_DIR, v->value, sizeof(ast_config_AST_DATA_DIR)); ast_copy_string(ast_config_AST_DATA_DIR, v->value, sizeof(ast_config_AST_DATA_DIR));
if (!found.keydir)
snprintf(ast_config_AST_KEY_DIR, sizeof(ast_config_AST_KEY_DIR), "%s/keys", v->value); snprintf(ast_config_AST_KEY_DIR, sizeof(ast_config_AST_KEY_DIR), "%s/keys", v->value);
} else if (!strcasecmp(v->name, "astkeydir")) {
snprintf(ast_config_AST_KEY_DIR, sizeof(ast_config_AST_KEY_DIR), "%s/keys", v->value);
found.keydir = 1;
} else if (!strcasecmp(v->name, "astlogdir")) { } else if (!strcasecmp(v->name, "astlogdir")) {
ast_copy_string(ast_config_AST_LOG_DIR, v->value, sizeof(ast_config_AST_LOG_DIR)); ast_copy_string(ast_config_AST_LOG_DIR, v->value, sizeof(ast_config_AST_LOG_DIR));
} else if (!strcasecmp(v->name, "astagidir")) { } else if (!strcasecmp(v->name, "astagidir")) {