diff --git a/data/conf/cgrates.cfg b/data/conf/cgrates.cfg index 7d19767df..9b14678c7 100644 --- a/data/conf/cgrates.cfg +++ b/data/conf/cgrates.cfg @@ -39,7 +39,7 @@ [rater] # enabled = false # Enable RaterCDRSExportPath service: . -# balancer = # Register to Balancer as worker: <""|127.0.0.1:2013>. +# balancer = # Register to Balancer as worker: <""|internal|127.0.0.1:2013>. [scheduler] # enabled = false # Starts Scheduler service: . diff --git a/data/tutorials/fs_csv/cgrates/etc/cgrates/cgrates.cfg b/data/tutorials/fs_csv/cgrates/etc/cgrates/cgrates.cfg index 5ee293764..a3fe952ec 100644 --- a/data/tutorials/fs_csv/cgrates/etc/cgrates/cgrates.cfg +++ b/data/tutorials/fs_csv/cgrates/etc/cgrates/cgrates.cfg @@ -24,11 +24,13 @@ # stordb_user = cgrates # Username to use when connecting to stordb. # stordb_passwd = CGRateS.org # Password to use when connecting to stordb. # dbdata_encoding = msgpack # The encoding used to store object data in strings: -# rpc_encoding = json # RPC encoding used on APIs: . +# rpc_json_listen = 127.0.0.1:2012 # RPC JSON listening address +# rpc_gob_listen = 127.0.0.1:2013 # RPC GOB listening address +# http_listen = 127.0.0.1:2080 # HTTP listening address # default_reqtype = rated # Default request type to consider when missing from requests: <""|prepaid|postpaid|pseudoprepaid|rated>. -# default_tor = 0 # Default Type of Record to consider when missing from requests. -# default_tenant = 0 # Default Tenant to consider when missing from requests. -# default_subject = 0 # Default rating Subject to consider when missing from requests. +# default_tor = call # Default Type of Record to consider when missing from requests. +# default_tenant = cgrates.org # Default Tenant to consider when missing from requests. +# default_subject = cgrates # Default rating Subject to consider when missing from requests. # rounding_method = *middle # Rounding method for floats/costs: <*up|*middle|*down> # rounding_decimals = 4 # Number of decimals to round float/costs at @@ -38,15 +40,13 @@ [rater] enabled = true # Enable RaterCDRSExportPath service: . -# balancer = disabled # Register to Balancer as worker: . -# listen = 127.0.0.1:2012 # Rater's listening interface: . +# balancer = # Register to Balancer as worker: <""|internal|127.0.0.1:2013>. [scheduler] enabled = true # Starts Scheduler service: . [cdrs] enabled = true # Start the CDR Server service: . -# listen=127.0.0.1:2022 # CDRS's listening interface: . # extra_fields = # Extra fields to store in CDRs mediator = internal # Address where to reach the Mediator. Empty for disabling mediation. <""|internal> @@ -57,7 +57,7 @@ export_dir = /tmp # Path where the exported CDRs will be placed [cdrc] enabled = true # Enable CDR client functionality -# cdrs = 127.0.0.1:2022 # Address where to reach CDR server +# cdrs = internal # Address where to reach CDR server. # cdrs_method = http_cgr # Mechanism to use when posting CDRs on server # run_delay = 0 # Sleep interval in seconds between consecutive runs, 0 to use automation via inotify cdr_type = freeswitch_csv # CDR file format . @@ -78,8 +78,7 @@ extra_fields = read_codec:13,write_codec:14 # Extra fields identifiers. For .csv [mediator] enabled = true # Starts Mediator service: . -# listen=internal # Mediator's listening interface: . -# rater = 127.0.0.1:2012 # Address where to reach the Rater: +# rater = internal # Address where to reach the Rater: # rater_reconnects = 3 # Number of reconnects to rater before giving up. # run_ids = # Identifiers of each extra mediation to run on CDRs # reqtype_fields = # Name of request type fields to be used during extra mediation. Use index number in case of .csv cdrs. @@ -95,7 +94,7 @@ enabled = true # Starts Mediator service: . [session_manager] enabled = true # Starts SessionManager service: . # switch_type = freeswitch # Defines the type of switch behind: . -# rater = 127.0.0.1:2012 # Address where to reach the Rater. +# rater = internal # Address where to reach the Rater. # rater_reconnects = 3 # Number of reconnects to rater before giving up. # debit_interval = 5 # Interval to perform debits on. @@ -106,11 +105,16 @@ enabled = true # Starts SessionManager service: . [history_server] enabled = true # Starts History service: . -# listen = 127.0.0.1:2013 # Listening addres for history server: history_dir = /tmp/cgr_history # Location on disk where to store history files. # save_interval = 1s # Interval to save changed cache into .git archive [history_agent] # enabled = false # Starts History as a client: . -# server = 127.0.0.1:2013 # Address where to reach the master history server: +# server = internal # Address where to reach the master history server: + +[mailer] +# server = localhost # The server to use when sending emails out +# auth_user = cgrates # Authenticate to email server using this user +# auth_passwd = CGRateS.org # Authenticate to email server with this password +# from_address = cgr-mailer@localhost.localdomain # From address used when sending emails out diff --git a/data/tutorials/fs_csv/cgrates/tariffplans/AccountActions.csv b/data/tutorials/fs_csv/cgrates/tariffplans/AccountActions.csv index 455f5318c..e00c681bf 100644 --- a/data/tutorials/fs_csv/cgrates/tariffplans/AccountActions.csv +++ b/data/tutorials/fs_csv/cgrates/tariffplans/AccountActions.csv @@ -1,4 +1,4 @@ -#Tenant,Account,Direction,ActionTimingsTag,ActionTriggersTag +#Tenant,Account,Direction,ActionPlanTag,ActionTriggersTag cgrates.org,1001,*out,PREPAID_10,STANDARD_TRIGGERS cgrates.org,1002,*out,PREPAID_10,STANDARD_TRIGGERS cgrates.org,1003,*out,PREPAID_10,STANDARD_TRIGGERS diff --git a/data/tutorials/fs_json/cgrates/etc/cgrates/cgrates.cfg b/data/tutorials/fs_json/cgrates/etc/cgrates/cgrates.cfg index 1ac42f06e..a40598797 100644 --- a/data/tutorials/fs_json/cgrates/etc/cgrates/cgrates.cfg +++ b/data/tutorials/fs_json/cgrates/etc/cgrates/cgrates.cfg @@ -24,11 +24,13 @@ # stordb_user = cgrates # Username to use when connecting to stordb. # stordb_passwd = CGRateS.org # Password to use when connecting to stordb. # dbdata_encoding = msgpack # The encoding used to store object data in strings: -# rpc_encoding = json # RPC encoding used on APIs: . +# rpc_json_listen = 127.0.0.1:2012 # RPC JSON listening address +# rpc_gob_listen = 127.0.0.1:2013 # RPC GOB listening address +# http_listen = 127.0.0.1:2080 # HTTP listening address # default_reqtype = rated # Default request type to consider when missing from requests: <""|prepaid|postpaid|pseudoprepaid|rated>. -# default_tor = 0 # Default Type of Record to consider when missing from requests. -# default_tenant = 0 # Default Tenant to consider when missing from requests. -# default_subject = 0 # Default rating Subject to consider when missing from requests. +# default_tor = call # Default Type of Record to consider when missing from requests. +# default_tenant = cgrates.org # Default Tenant to consider when missing from requests. +# default_subject = cgrates # Default rating Subject to consider when missing from requests. # rounding_method = *middle # Rounding method for floats/costs: <*up|*middle|*down> # rounding_decimals = 4 # Number of decimals to round float/costs at @@ -38,15 +40,13 @@ [rater] enabled = true # Enable RaterCDRSExportPath service: . -# balancer = disabled # Register to Balancer as worker: . -# listen = 127.0.0.1:2012 # Rater's listening interface: . +# balancer = # Register to Balancer as worker: <""|internal|127.0.0.1:2013>. [scheduler] enabled = true # Starts Scheduler service: . [cdrs] enabled = true # Start the CDR Server service: . -# listen=127.0.0.1:2022 # CDRS's listening interface: . # extra_fields = # Extra fields to store in CDRs mediator = internal # Address where to reach the Mediator. Empty for disabling mediation. <""|internal> @@ -57,29 +57,28 @@ export_dir = /tmp # Path where the exported CDRs will be placed [cdrc] # enabled = false # Enable CDR client functionality -# cdrs = 127.0.0.1:2022 # Address where to reach CDR server +# cdrs = internal # Address where to reach CDR server. # cdrs_method = http_cgr # Mechanism to use when posting CDRs on server # run_delay = 0 # Sleep interval in seconds between consecutive runs, 0 to use automation via inotify -# cdr_type = freeswitch_csv # CDR file format . +# cdr_type = csv # CDR file format . # cdr_in_dir = /var/log/cgrates/cdr/cdrc/in # Absolute path towards the directory where the CDRs are stored. -# cdr_out_dir = /tmp # Absolute path towards the directory where processed CDRs will be moved. +# cdr_out_dir = /var/log/cgrates/cdr/cdrc/out # Absolute path towards the directory where processed CDRs will be moved. # cdr_source_id = freeswitch_csv # Free form field, tag identifying the source of the CDRs within CGRS database. -# accid_field = 10 # Accounting id field identifier. Use index number in case of .csv cdrs. -# reqtype_field = 16 # Request type field identifier. Use index number in case of .csv cdrs. -# direction_field = ^*out # Direction field identifier. Use index numbers in case of .csv cdrs. -# tenant_field = ^cgrates.org # Tenant field identifier. Use index numbers in case of .csv cdrs. -# tor_field = ^call # Type of Record field identifier. Use index numbers in case of .csv cdrs. -# account_field = 1 # Account field identifier. Use index numbers in case of .csv cdrs. -# subject_field = 1 # Subject field identifier. Use index numbers in case of .csv CDRs. -# destination_field = 2 # Destination field identifier. Use index numbers in case of .csv cdrs. -# answer_time_field = 5 # Answer time field identifier. Use index numbers in case of .csv cdrs. -# duration_field = 8 # Duration field identifier. Use index numbers in case of .csv cdrs. -# extra_fields = read_codec:13,write_codec:14 # Extra fields identifiers. For .csv, format: : +# accid_field = 0 # Accounting id field identifier. Use index number in case of .csv cdrs. +# reqtype_field = 1 # Request type field identifier. Use index number in case of .csv cdrs. +# direction_field = 2 # Direction field identifier. Use index numbers in case of .csv cdrs. +# tenant_field = 3 # Tenant field identifier. Use index numbers in case of .csv cdrs. +# tor_field = 4 # Type of Record field identifier. Use index numbers in case of .csv cdrs. +# account_field = 5 # Account field identifier. Use index numbers in case of .csv cdrs. +# subject_field = 6 # Subject field identifier. Use index numbers in case of .csv CDRs. +# destination_field = 7 # Destination field identifier. Use index numbers in case of .csv cdrs. +# answer_time_field = 8 # Answer time field identifier. Use index numbers in case of .csv cdrs. +# duration_field = 9 # Duration field identifier. Use index numbers in case of .csv cdrs. +# extra_fields = # Extra fields identifiers. For .csv, format: :[...,:] [mediator] enabled = true # Starts Mediator service: . -# listen=internal # Mediator's listening interface: . -# rater = 127.0.0.1:2012 # Address where to reach the Rater: +# rater = internal # Address where to reach the Rater: # rater_reconnects = 3 # Number of reconnects to rater before giving up. # run_ids = # Identifiers of each extra mediation to run on CDRs # reqtype_fields = # Name of request type fields to be used during extra mediation. Use index number in case of .csv cdrs. @@ -95,7 +94,7 @@ enabled = true # Starts Mediator service: . [session_manager] enabled = true # Starts SessionManager service: . # switch_type = freeswitch # Defines the type of switch behind: . -# rater = 127.0.0.1:2012 # Address where to reach the Rater. +# rater = internal # Address where to reach the Rater. # rater_reconnects = 3 # Number of reconnects to rater before giving up. # debit_interval = 5 # Interval to perform debits on. @@ -106,11 +105,16 @@ enabled = true # Starts SessionManager service: . [history_server] enabled = true # Starts History service: . -# listen = 127.0.0.1:2013 # Listening addres for history server: history_dir = /tmp/cgr_history # Location on disk where to store history files. # save_interval = 1s # Interval to save changed cache into .git archive [history_agent] # enabled = false # Starts History as a client: . -# server = 127.0.0.1:2013 # Address where to reach the master history server: +# server = internal # Address where to reach the master history server: + +[mailer] +# server = localhost # The server to use when sending emails out +# auth_user = cgrates # Authenticate to email server using this user +# auth_passwd = CGRateS.org # Authenticate to email server with this password +# from_address = cgr-mailer@localhost.localdomain # From address used when sending emails out diff --git a/data/tutorials/fs_json/cgrates/tariffplans/AccountActions.csv b/data/tutorials/fs_json/cgrates/tariffplans/AccountActions.csv index 455f5318c..e00c681bf 100644 --- a/data/tutorials/fs_json/cgrates/tariffplans/AccountActions.csv +++ b/data/tutorials/fs_json/cgrates/tariffplans/AccountActions.csv @@ -1,4 +1,4 @@ -#Tenant,Account,Direction,ActionTimingsTag,ActionTriggersTag +#Tenant,Account,Direction,ActionPlanTag,ActionTriggersTag cgrates.org,1001,*out,PREPAID_10,STANDARD_TRIGGERS cgrates.org,1002,*out,PREPAID_10,STANDARD_TRIGGERS cgrates.org,1003,*out,PREPAID_10,STANDARD_TRIGGERS