[svn-commits] seanbright: branch group/NoLossCDR-Redux2 r104535 - in /team/group/NoLossCDR-...

[SVN commits to the Digium repositories]

Author: seanbright
Date: Wed Feb 27 09:47:47 2008
New Revision: 104535

URL: http://svn.digium.com/view/asterisk?view=rev&rev=104535
Log:
Move RADIUS config to its own file.

Added:
    team/group/NoLossCDR-Redux2/configs/cdr_radius.conf.sample   (with props)
Modified:
    team/group/NoLossCDR-Redux2/cdr/cdr_radius.c
    team/group/NoLossCDR-Redux2/configs/cdr.conf.sample

Modified: team/group/NoLossCDR-Redux2/cdr/cdr_radius.c
URL: http://svn.digium.com/view/asterisk/team/group/NoLossCDR-Redux2/cdr/cdr_radius.c?view=diff&rev=104535&r1=104534&r2=104535
==============================================================================
--- team/group/NoLossCDR-Redux2/cdr/cdr_radius.c (original)
+++ team/group/NoLossCDR-Redux2/cdr/cdr_radius.c Wed Feb 27 09:47:47 2008
@@ -79,7 +79,7 @@
 
 static char *desc = "RADIUS CDR Backend";
 static char *name = "radius";
-static char *cdr_config = "cdr.conf";
+static char *cdr_config = "cdr_radius.conf";
 
 static char radiuscfg[PATH_MAX] = "/etc/radiusclient-ng/radiusclient.conf";
 
@@ -230,10 +230,10 @@
 	const char *tmp;
 
 	if ((cfg = ast_config_load(cdr_config, config_flags))) {
-		ast_set2_flag(&global_flags, ast_true(ast_variable_retrieve(cfg, "radius", "usegmtime")), RADIUS_FLAG_USEGMTIME);
-		ast_set2_flag(&global_flags, ast_true(ast_variable_retrieve(cfg, "radius", "loguniqueid")), RADIUS_FLAG_LOGUNIQUEID);
-		ast_set2_flag(&global_flags, ast_true(ast_variable_retrieve(cfg, "radius", "loguserfield")), RADIUS_FLAG_LOGUSERFIELD);
-		if ((tmp = ast_variable_retrieve(cfg, "radius", "radiuscfg")))
+		ast_set2_flag(&global_flags, ast_true(ast_variable_retrieve(cfg, "general", "usegmtime")), RADIUS_FLAG_USEGMTIME);
+		ast_set2_flag(&global_flags, ast_true(ast_variable_retrieve(cfg, "general", "loguniqueid")), RADIUS_FLAG_LOGUNIQUEID);
+		ast_set2_flag(&global_flags, ast_true(ast_variable_retrieve(cfg, "general", "loguserfield")), RADIUS_FLAG_LOGUSERFIELD);
+		if ((tmp = ast_variable_retrieve(cfg, "general", "radiuscfg")))
 			ast_copy_string(radiuscfg, tmp, sizeof(radiuscfg));
 		ast_config_destroy(cfg);
 	} else 

Modified: team/group/NoLossCDR-Redux2/configs/cdr.conf.sample
URL: http://svn.digium.com/view/asterisk/team/group/NoLossCDR-Redux2/configs/cdr.conf.sample?view=diff&rev=104535&r1=104534&r2=104535
==============================================================================
--- team/group/NoLossCDR-Redux2/configs/cdr.conf.sample (original)
+++ team/group/NoLossCDR-Redux2/configs/cdr.conf.sample Wed Feb 27 09:47:47 2008
@@ -118,9 +118,10 @@
 ; has a [global] section with the proper variables defined.
 ;
 ; For logging to radius databases, make sure all the proper libs are installed, that 
-; "make menuselect" shows that the modules are available, and the [radius]
-; category is defined in this file, and in that section, make sure the 'radiuscfg'
-; variable is properly pointing to an existing radiusclient.conf file.
+; "make menuselect" shows that the modules are available, and that cdr_radius.conf exists
+; and has a [general] section with the proper variables defined. Make sure the 'radiuscfg'
+; variable in the [general] section is properly pointing to an existing radiusclient.conf
+; file.
 ;
 ; For logging to sqlite databases, make sure the 'cdr.db' file exists in the log directory,
 ; which is usually /var/log/asterisk. Of course, the proper libraries should be available
@@ -138,11 +139,3 @@
 usegmtime=yes    ; log date/time in GMT.  Default is "no"
 loguniqueid=yes  ; log uniqueid.  Default is "no
 loguserfield=yes ; log user field.  Default is "no
-
-;[radius]
-;usegmtime=yes    ; log date/time in GMT
-;loguniqueid=yes  ; log uniqueid
-;loguserfield=yes ; log user field
-; Set this to the location of the radiusclient-ng configuration file
-; The default is /etc/radiusclient-ng/radiusclient.conf
-;radiuscfg => /usr/local/etc/radiusclient-ng/radiusclient.conf

Added: team/group/NoLossCDR-Redux2/configs/cdr_radius.conf.sample
URL: http://svn.digium.com/view/asterisk/team/group/NoLossCDR-Redux2/configs/cdr_radius.conf.sample?view=auto&rev=104535
==============================================================================
--- team/group/NoLossCDR-Redux2/configs/cdr_radius.conf.sample (added)
+++ team/group/NoLossCDR-Redux2/configs/cdr_radius.conf.sample Wed Feb 27 09:47:47 2008
@@ -1,0 +1,11 @@
+;
+; RADIUS Call Detail Record Configuration
+;
+
+[general]
+;usegmtime=yes    ; log date/time in GMT
+;loguniqueid=yes  ; log uniqueid
+;loguserfield=yes ; log user field
+; Set this to the location of the radiusclient-ng configuration file.
+; The default is /etc/radiusclient-ng/radiusclient.conf
+;radiuscfg => /usr/local/etc/radiusclient-ng/radiusclient.conf

Propchange: team/group/NoLossCDR-Redux2/configs/cdr_radius.conf.sample
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: team/group/NoLossCDR-Redux2/configs/cdr_radius.conf.sample
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: team/group/NoLossCDR-Redux2/configs/cdr_radius.conf.sample
------------------------------------------------------------------------------
    svn:mime-type = text/plain