From 96b1c94cf2a86b2d41bae1789932e821874c1b10 Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Fri, 25 Feb 2011 11:28:34 +0200 Subject: [PATCH] Removed \r and spaces at the EOL in config files --- .../stargazer/conf-available.d/mod_ao.conf | 2 +- .../conf-available.d/mod_cap_bpf.conf | 3 +- .../conf-available.d/mod_cap_divert.conf | 4 +- .../conf-available.d/mod_cap_nf.conf | 5 +- .../stargazer/conf-available.d/mod_ia.conf | 2 +- .../stargazer/conf-available.d/mod_ping.conf | 3 +- .../conf-available.d/mod_radius.conf | 2 +- .../conf-available.d/mod_remote_script.conf | 3 +- .../stargazer/conf-available.d/mod_rpc.conf | 2 +- .../stargazer/conf-available.d/mod_sg.conf | 3 +- .../conf-available.d/store_files.conf | 4 +- .../conf-available.d/store_firebird.conf | 2 +- .../conf-available.d/store_mysql.conf | 2 +- .../conf-available.d/store_postgresql.conf | 2 +- .../stargazer/conf-enabled.d/store_files.conf | 1 + .../inst/freebsd/etc/stargazer/stargazer.conf | 342 +++++++++--------- .../stargazer/conf-available.d/mod_ao.conf | 2 +- .../conf-available.d/mod_cap_ether.conf | 5 +- .../conf-available.d/mod_cap_ipq.conf | 4 +- .../conf-available.d/mod_cap_nf.conf | 5 +- .../stargazer/conf-available.d/mod_ia.conf | 2 +- .../stargazer/conf-available.d/mod_ping.conf | 3 +- .../conf-available.d/mod_radius.conf | 2 +- .../conf-available.d/mod_remote_script.conf | 3 +- .../stargazer/conf-available.d/mod_rpc.conf | 2 +- .../stargazer/conf-available.d/mod_sg.conf | 3 +- .../conf-available.d/store_files.conf | 4 +- .../conf-available.d/store_firebird.conf | 2 +- .../conf-available.d/store_mysql.conf | 2 +- .../conf-available.d/store_postgresql.conf | 2 +- .../stargazer/conf-enabled.d/store_files.conf | 1 + .../inst/linux/etc/stargazer/stargazer.conf | 342 +++++++++--------- 32 files changed, 379 insertions(+), 387 deletions(-) create mode 120000 projects/stargazer/inst/freebsd/etc/stargazer/conf-enabled.d/store_files.conf create mode 120000 projects/stargazer/inst/linux/etc/stargazer/conf-enabled.d/store_files.conf diff --git a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_ao.conf b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_ao.conf index 08926e95..62c0dc7f 100644 --- a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_ao.conf +++ b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_ao.conf @@ -1,3 +1,3 @@ # Enable the authorization module Always Online "mod_auth_ao.so" - + \ No newline at end of file diff --git a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_cap_bpf.conf b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_cap_bpf.conf index e6016474..4a6c6264 100644 --- a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_cap_bpf.conf +++ b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_cap_bpf.conf @@ -4,5 +4,4 @@ iface = rl0 iface = rl1 iface = dc0 - - + \ No newline at end of file diff --git a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_cap_divert.conf b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_cap_divert.conf index d280e40d..ab0ddfb5 100644 --- a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_cap_divert.conf +++ b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_cap_divert.conf @@ -1,8 +1,8 @@ -# Enable the traffic capture module "mod_cap_divert.so" using Divert-sockets +# Enable the traffic capture module "mod_cap_divert.so" using Divert-sockets # Port for traffic # Parameter: required # Value: 1 ... 65535 # Default: 15701 Port = 15701 - + \ No newline at end of file diff --git a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_cap_nf.conf b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_cap_nf.conf index 34e76870..f3cbc40c 100644 --- a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_cap_nf.conf +++ b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_cap_nf.conf @@ -1,5 +1,5 @@ # Enable the traffic capture module "mod_cap_ipq.so" using NetFlow protocol - + # Port for TCP connections # Note: Parameters TCPPort and UDPPort can be equal # Parameter: optional @@ -13,5 +13,4 @@ # Value: 1 ... 65536 # Default: 9996 UDPPort = 9996 - - + \ No newline at end of file diff --git a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_ia.conf b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_ia.conf index fb1c4cde..aa18309a 100644 --- a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_ia.conf +++ b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_ia.conf @@ -35,4 +35,4 @@ # Values: different, see above # Default: cash FreeMb = cash - + \ No newline at end of file diff --git a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_ping.conf b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_ping.conf index ec823fc5..74022194 100644 --- a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_ping.conf +++ b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_ping.conf @@ -5,5 +5,4 @@ # Value: 10 ... 3600 (seconds) # Default: 15 PingDelay = 15 - - + \ No newline at end of file diff --git a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_radius.conf b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_radius.conf index 00aeaa56..edc94d50 100644 --- a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_radius.conf +++ b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_radius.conf @@ -31,4 +31,4 @@ # Value: any, supported by software # Default: Framed-User AcctServices = Framed-User - + \ No newline at end of file diff --git a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_remote_script.conf b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_remote_script.conf index 6fff4924..b3d0ab76 100644 --- a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_remote_script.conf +++ b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_remote_script.conf @@ -39,5 +39,4 @@ # Value: 1...65535 # Default: 9999 Port = 9999 - - + \ No newline at end of file diff --git a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_rpc.conf b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_rpc.conf index eacf7391..06eeba4e 100644 --- a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_rpc.conf +++ b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_rpc.conf @@ -11,4 +11,4 @@ # Value: any numeric # Default: 1800 CookieTimeout = 1800 - + \ No newline at end of file diff --git a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_sg.conf b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_sg.conf index 1931a121..610a3128 100644 --- a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_sg.conf +++ b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_sg.conf @@ -5,5 +5,4 @@ # Value: 1...65535 # Default: 5555 Port = 5555 - - + \ No newline at end of file diff --git a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/store_files.conf b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/store_files.conf index e9c5bc5d..b69ad45e 100644 --- a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/store_files.conf +++ b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/store_files.conf @@ -1,4 +1,4 @@ -# Option - the name of the module without 'mod_' at the beginning and '.so' +# Option - the name of the module without 'mod_' at the beginning and '.so' # in the end ie full name of the module mod_store_files.so @@ -28,4 +28,4 @@ UserLogGroup = stargazer UserLogMode = 640 - + \ No newline at end of file diff --git a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/store_firebird.conf b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/store_firebird.conf index 837889e3..99b629ae 100644 --- a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/store_firebird.conf +++ b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/store_firebird.conf @@ -34,4 +34,4 @@ # Values: wait, nowait # Defalt: wait lockResolution = wait - + \ No newline at end of file diff --git a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/store_mysql.conf b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/store_mysql.conf index af540661..475b5f27 100644 --- a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/store_mysql.conf +++ b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/store_mysql.conf @@ -22,4 +22,4 @@ # Value: any, supported by database # Default: 123456 rootdbpass = 123456 - + \ No newline at end of file diff --git a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/store_postgresql.conf b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/store_postgresql.conf index 1b0aaf4c..86c76f44 100644 --- a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/store_postgresql.conf +++ b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/store_postgresql.conf @@ -22,4 +22,4 @@ # Value: any, supported by database # Default: 123456 password = 123456 - + \ No newline at end of file diff --git a/projects/stargazer/inst/freebsd/etc/stargazer/conf-enabled.d/store_files.conf b/projects/stargazer/inst/freebsd/etc/stargazer/conf-enabled.d/store_files.conf new file mode 120000 index 00000000..cb4e4da0 --- /dev/null +++ b/projects/stargazer/inst/freebsd/etc/stargazer/conf-enabled.d/store_files.conf @@ -0,0 +1 @@ +../conf-available.d/store_files.conf \ No newline at end of file diff --git a/projects/stargazer/inst/freebsd/etc/stargazer/stargazer.conf b/projects/stargazer/inst/freebsd/etc/stargazer/stargazer.conf index 5c0693c4..ae5e1382 100644 --- a/projects/stargazer/inst/freebsd/etc/stargazer/stargazer.conf +++ b/projects/stargazer/inst/freebsd/etc/stargazer/stargazer.conf @@ -1,171 +1,171 @@ -################################################################################ -# Stargazer Configuration file # -################################################################################ - -# LOG file name -# Parameter: required -# Value: file path -# Default: /var/log/stargazer.log -LogFile = /var/log/stargazer.log - -# PID file name -# Parameter: optional -# Value: file path -# Default: /var/run/stargazer.pid -PIDFile = /var/run/stargazer.pid - -# Traffic classification rules -# Parameter: required -# Value: file path -# Default: /etc/stargazer/rules -Rules = /etc/stargazer/rules - -# The time interval between writing detailed user's statistics into the database -# Note: With a large number of users this value should be increased, -# since writting into the database can take a long time. -# Parameter: required -# Values: 1 (hourly), 1/2 (every half hour), 1/4 (every 15 m), 1/6 (every 10 m) -# Default: 1/2 -DetailStatWritePeriod = 1/2 - -# The time interval between writing summary user's statistics into the database -# Parameter: optional -# Value: 1 ... 1440 (minutes) -# Default: 10 -StatWritePeriod = 10 - -# Day of charging fee -# Note: 0 - The last day of the month -# Parameter: required -# Value: 0 ... 31 -# Default: 1 -DayFee = 1 - -# Fee charged at the last (yes) or first (no) day of tariffication period. -# Defines how the fee will be charged in the transition to the new tariff. -# User has tariff A with fee 100. Changing it to tariff B with fee 200 -# will result in charging user's account at 100 if DayFeeIsLastDay = yes -# and at 200, if DayFeeIsLastDay = no -# Parameter: required -# Values: yes, no -# Default: no -DayFeeIsLastDay = no - -# Day of changing delayed tariffs and resetting summary user's statistics. -# Defines the edge of the tariffication period. -# Parameter: required -# Value: 0 ... 31. 0 - The last day of the month -# Default: 1 -DayResetTraff = 1 - -# Defines whether to charge fee daily (yes) or monthly (no) -# Parameter: required -# Values: yes, no -# Default: no -SpreadFee = no - -# Defines whether the user can access the internet if it has no cash, -# but remained prepaid traffic -# Parameter: required -# Values: yes, no -# Default: no -FreeMbAllowInet = no - -# Defines what will be written in the traffic cost in detail_stat. -# If user still has the prepaid traffic and WriteFreeMbTraffCost = no, -# then the traffic cost willn't be written in detail_stat. -# If user doestn't have prepaid traffic and WriteFreeMbTraffCost = no, -# then the traffic cost will be written in detail_stat. -# When WriteFreeMbTraffCost = yes the traffic cost will be recorded in any case. -# Parameter: required -# Values: yes, no -# Default: yes -WriteFreeMbTraffCost = yes - -# Charge a full monthly fee even if user was "frozen" a part -# of the tariffication period -# Parameter: optional -# Values: yes, no -# Default: no -FullFee = yes - -# Allow user to see and use a full cash (yes) or hide a part of it (no) -# for the next fee charge -# Parameter: optional -# Values: yes, no -# Default: yes -# ShowFeeInCash=yes - -# The names of directions. Direction without names will not appear in -# authorizer and configurator. -# Note: Names consisting of several words should be quoted -# Parameter: optional -# Values: - - DirName0 = Internet - DirName1 = - DirName2 = - DirName3 = - DirName4 = - DirName5 = - DirName6 = - DirName7 = - DirName8 = - DirName9 = - - -# Amount of stg-exec processes. -# These processes are responsible for the execution of scripts OnConnect, -# OnDisconnect, etc. -# Amount of processes means how many scripts can be executed simultaneously. -# Recommend to leave 1 to avoid errors when executing scripts -# Parameter: optional -# Value: 1 ... 1024 -# Default: 1 -ExecutersNum = 1 - -# Message queue identifier for the script executer. -# It may be changed if there're a needs to run multiple copies of stargazer. -# Warning: If you do not understand it, do not touch this setting! -# Parameter: optional -# Value: 0 ... 2 ^ 32 -# Default: 5555 -# ExecMsgKey = 5555 - -# The path to directory with server modules -# Parameter: required -# Value: directory path -# Default: /usr/lib/stg -ModulesPath = /usr/lib/stg - -# Directory where the "monitor" files are located. -# A blank files will be created in this directory. The modification time of such -# files will be changed about once a minute. If server crashes or some of server -# component hang, the files will stop refreshing, and on this basis we can define -# the failure of the server and if necessary restart. -# If option is omitted or blank, the monitoring is not performed. -# Parameter: optional -# Value: file path -# Default: /var/stargazer/monitor -#MonitorDir=/var/stargazer/monitor - -################################################################################ -# Store module -# Configure the module that works with the database server - -# Warning: Only one store module could be used at the same time! - - - - - -################################################################################ -# Other modules - - - - - - - -################################################################################ +################################################################################ +# Stargazer Configuration file # +################################################################################ + +# LOG file name +# Parameter: required +# Value: file path +# Default: /var/log/stargazer.log +LogFile = /var/log/stargazer.log + +# PID file name +# Parameter: optional +# Value: file path +# Default: /var/run/stargazer.pid +PIDFile = /var/run/stargazer.pid + +# Traffic classification rules +# Parameter: required +# Value: file path +# Default: /etc/stargazer/rules +Rules = /etc/stargazer/rules + +# The time interval between writing detailed user's statistics into the database +# Note: With a large number of users this value should be increased, +# since writting into the database can take a long time. +# Parameter: required +# Values: 1 (hourly), 1/2 (every half hour), 1/4 (every 15 m), 1/6 (every 10 m) +# Default: 1/2 +DetailStatWritePeriod = 1/2 + +# The time interval between writing summary user's statistics into the database +# Parameter: optional +# Value: 1 ... 1440 (minutes) +# Default: 10 +StatWritePeriod = 10 + +# Day of charging fee +# Note: 0 - The last day of the month +# Parameter: required +# Value: 0 ... 31 +# Default: 1 +DayFee = 1 + +# Fee charged at the last (yes) or first (no) day of tariffication period. +# Defines how the fee will be charged in the transition to the new tariff. +# User has tariff A with fee 100. Changing it to tariff B with fee 200 +# will result in charging user's account at 100 if DayFeeIsLastDay = yes +# and at 200, if DayFeeIsLastDay = no +# Parameter: required +# Values: yes, no +# Default: no +DayFeeIsLastDay = no + +# Day of changing delayed tariffs and resetting summary user's statistics. +# Defines the edge of the tariffication period. +# Parameter: required +# Value: 0 ... 31. 0 - The last day of the month +# Default: 1 +DayResetTraff = 1 + +# Defines whether to charge fee daily (yes) or monthly (no) +# Parameter: required +# Values: yes, no +# Default: no +SpreadFee = no + +# Defines whether the user can access the internet if it has no cash, +# but remained prepaid traffic +# Parameter: required +# Values: yes, no +# Default: no +FreeMbAllowInet = no + +# Defines what will be written in the traffic cost in detail_stat. +# If user still has the prepaid traffic and WriteFreeMbTraffCost = no, +# then the traffic cost willn't be written in detail_stat. +# If user doestn't have prepaid traffic and WriteFreeMbTraffCost = no, +# then the traffic cost will be written in detail_stat. +# When WriteFreeMbTraffCost = yes the traffic cost will be recorded in any case. +# Parameter: required +# Values: yes, no +# Default: yes +WriteFreeMbTraffCost = yes + +# Charge a full monthly fee even if user was "frozen" a part +# of the tariffication period +# Parameter: optional +# Values: yes, no +# Default: no +FullFee = yes + +# Allow user to see and use a full cash (yes) or hide a part of it (no) +# for the next fee charge +# Parameter: optional +# Values: yes, no +# Default: yes +# ShowFeeInCash=yes + +# The names of directions. Direction without names will not appear in +# authorizer and configurator. +# Note: Names consisting of several words should be quoted +# Parameter: optional +# Values: + + DirName0 = Internet + DirName1 = + DirName2 = + DirName3 = + DirName4 = + DirName5 = + DirName6 = + DirName7 = + DirName8 = + DirName9 = + + +# Amount of stg-exec processes. +# These processes are responsible for the execution of scripts OnConnect, +# OnDisconnect, etc. +# Amount of processes means how many scripts can be executed simultaneously. +# Recommend to leave 1 to avoid errors when executing scripts +# Parameter: optional +# Value: 1 ... 1024 +# Default: 1 +ExecutersNum = 1 + +# Message queue identifier for the script executer. +# It may be changed if there're a needs to run multiple copies of stargazer. +# Warning: If you do not understand it, do not touch this setting! +# Parameter: optional +# Value: 0 ... 2 ^ 32 +# Default: 5555 +# ExecMsgKey = 5555 + +# The path to directory with server modules +# Parameter: required +# Value: directory path +# Default: /usr/lib/stg +ModulesPath = /usr/lib/stg + +# Directory where the "monitor" files are located. +# A blank files will be created in this directory. The modification time of such +# files will be changed about once a minute. If server crashes or some of server +# component hang, the files will stop refreshing, and on this basis we can define +# the failure of the server and if necessary restart. +# If option is omitted or blank, the monitoring is not performed. +# Parameter: optional +# Value: file path +# Default: /var/stargazer/monitor +#MonitorDir=/var/stargazer/monitor + +################################################################################ +# Store module +# Configure the module that works with the database server + +# Warning: Only one store module could be used at the same time! + + + + + +################################################################################ +# Other modules + + + + + + + +################################################################################ diff --git a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_ao.conf b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_ao.conf index 08926e95..62c0dc7f 100644 --- a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_ao.conf +++ b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_ao.conf @@ -1,3 +1,3 @@ # Enable the authorization module Always Online "mod_auth_ao.so" - + \ No newline at end of file diff --git a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_cap_ether.conf b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_cap_ether.conf index 29f1e2f4..677ed5a7 100644 --- a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_cap_ether.conf +++ b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_cap_ether.conf @@ -1,4 +1,3 @@ # Enable the traffic capture module "mod_cap_ether.so" using Packet-sockets - - - + + \ No newline at end of file diff --git a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_cap_ipq.conf b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_cap_ipq.conf index b78076ec..6b4b3c00 100644 --- a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_cap_ipq.conf +++ b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_cap_ipq.conf @@ -1,3 +1,3 @@ # Enable the traffic capture module "mod_cap_ipq.so" using mechanism of IP Queueing - - + + \ No newline at end of file diff --git a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_cap_nf.conf b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_cap_nf.conf index 34e76870..f3cbc40c 100644 --- a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_cap_nf.conf +++ b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_cap_nf.conf @@ -1,5 +1,5 @@ # Enable the traffic capture module "mod_cap_ipq.so" using NetFlow protocol - + # Port for TCP connections # Note: Parameters TCPPort and UDPPort can be equal # Parameter: optional @@ -13,5 +13,4 @@ # Value: 1 ... 65536 # Default: 9996 UDPPort = 9996 - - + \ No newline at end of file diff --git a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_ia.conf b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_ia.conf index fb1c4cde..aa18309a 100644 --- a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_ia.conf +++ b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_ia.conf @@ -35,4 +35,4 @@ # Values: different, see above # Default: cash FreeMb = cash - + \ No newline at end of file diff --git a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_ping.conf b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_ping.conf index ec823fc5..74022194 100644 --- a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_ping.conf +++ b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_ping.conf @@ -5,5 +5,4 @@ # Value: 10 ... 3600 (seconds) # Default: 15 PingDelay = 15 - - + \ No newline at end of file diff --git a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_radius.conf b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_radius.conf index 00aeaa56..edc94d50 100644 --- a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_radius.conf +++ b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_radius.conf @@ -31,4 +31,4 @@ # Value: any, supported by software # Default: Framed-User AcctServices = Framed-User - + \ No newline at end of file diff --git a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_remote_script.conf b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_remote_script.conf index 6fff4924..b3d0ab76 100644 --- a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_remote_script.conf +++ b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_remote_script.conf @@ -39,5 +39,4 @@ # Value: 1...65535 # Default: 9999 Port = 9999 - - + \ No newline at end of file diff --git a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_rpc.conf b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_rpc.conf index eacf7391..06eeba4e 100644 --- a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_rpc.conf +++ b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_rpc.conf @@ -11,4 +11,4 @@ # Value: any numeric # Default: 1800 CookieTimeout = 1800 - + \ No newline at end of file diff --git a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_sg.conf b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_sg.conf index 1931a121..610a3128 100644 --- a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_sg.conf +++ b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_sg.conf @@ -5,5 +5,4 @@ # Value: 1...65535 # Default: 5555 Port = 5555 - - + \ No newline at end of file diff --git a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_files.conf b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_files.conf index e9c5bc5d..b69ad45e 100644 --- a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_files.conf +++ b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_files.conf @@ -1,4 +1,4 @@ -# Option - the name of the module without 'mod_' at the beginning and '.so' +# Option - the name of the module without 'mod_' at the beginning and '.so' # in the end ie full name of the module mod_store_files.so @@ -28,4 +28,4 @@ UserLogGroup = stargazer UserLogMode = 640 - + \ No newline at end of file diff --git a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_firebird.conf b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_firebird.conf index 837889e3..99b629ae 100644 --- a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_firebird.conf +++ b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_firebird.conf @@ -34,4 +34,4 @@ # Values: wait, nowait # Defalt: wait lockResolution = wait - + \ No newline at end of file diff --git a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_mysql.conf b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_mysql.conf index af540661..475b5f27 100644 --- a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_mysql.conf +++ b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_mysql.conf @@ -22,4 +22,4 @@ # Value: any, supported by database # Default: 123456 rootdbpass = 123456 - + \ No newline at end of file diff --git a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_postgresql.conf b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_postgresql.conf index 1b0aaf4c..86c76f44 100644 --- a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_postgresql.conf +++ b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/store_postgresql.conf @@ -22,4 +22,4 @@ # Value: any, supported by database # Default: 123456 password = 123456 - + \ No newline at end of file diff --git a/projects/stargazer/inst/linux/etc/stargazer/conf-enabled.d/store_files.conf b/projects/stargazer/inst/linux/etc/stargazer/conf-enabled.d/store_files.conf new file mode 120000 index 00000000..cb4e4da0 --- /dev/null +++ b/projects/stargazer/inst/linux/etc/stargazer/conf-enabled.d/store_files.conf @@ -0,0 +1 @@ +../conf-available.d/store_files.conf \ No newline at end of file diff --git a/projects/stargazer/inst/linux/etc/stargazer/stargazer.conf b/projects/stargazer/inst/linux/etc/stargazer/stargazer.conf index 5c0693c4..ae5e1382 100644 --- a/projects/stargazer/inst/linux/etc/stargazer/stargazer.conf +++ b/projects/stargazer/inst/linux/etc/stargazer/stargazer.conf @@ -1,171 +1,171 @@ -################################################################################ -# Stargazer Configuration file # -################################################################################ - -# LOG file name -# Parameter: required -# Value: file path -# Default: /var/log/stargazer.log -LogFile = /var/log/stargazer.log - -# PID file name -# Parameter: optional -# Value: file path -# Default: /var/run/stargazer.pid -PIDFile = /var/run/stargazer.pid - -# Traffic classification rules -# Parameter: required -# Value: file path -# Default: /etc/stargazer/rules -Rules = /etc/stargazer/rules - -# The time interval between writing detailed user's statistics into the database -# Note: With a large number of users this value should be increased, -# since writting into the database can take a long time. -# Parameter: required -# Values: 1 (hourly), 1/2 (every half hour), 1/4 (every 15 m), 1/6 (every 10 m) -# Default: 1/2 -DetailStatWritePeriod = 1/2 - -# The time interval between writing summary user's statistics into the database -# Parameter: optional -# Value: 1 ... 1440 (minutes) -# Default: 10 -StatWritePeriod = 10 - -# Day of charging fee -# Note: 0 - The last day of the month -# Parameter: required -# Value: 0 ... 31 -# Default: 1 -DayFee = 1 - -# Fee charged at the last (yes) or first (no) day of tariffication period. -# Defines how the fee will be charged in the transition to the new tariff. -# User has tariff A with fee 100. Changing it to tariff B with fee 200 -# will result in charging user's account at 100 if DayFeeIsLastDay = yes -# and at 200, if DayFeeIsLastDay = no -# Parameter: required -# Values: yes, no -# Default: no -DayFeeIsLastDay = no - -# Day of changing delayed tariffs and resetting summary user's statistics. -# Defines the edge of the tariffication period. -# Parameter: required -# Value: 0 ... 31. 0 - The last day of the month -# Default: 1 -DayResetTraff = 1 - -# Defines whether to charge fee daily (yes) or monthly (no) -# Parameter: required -# Values: yes, no -# Default: no -SpreadFee = no - -# Defines whether the user can access the internet if it has no cash, -# but remained prepaid traffic -# Parameter: required -# Values: yes, no -# Default: no -FreeMbAllowInet = no - -# Defines what will be written in the traffic cost in detail_stat. -# If user still has the prepaid traffic and WriteFreeMbTraffCost = no, -# then the traffic cost willn't be written in detail_stat. -# If user doestn't have prepaid traffic and WriteFreeMbTraffCost = no, -# then the traffic cost will be written in detail_stat. -# When WriteFreeMbTraffCost = yes the traffic cost will be recorded in any case. -# Parameter: required -# Values: yes, no -# Default: yes -WriteFreeMbTraffCost = yes - -# Charge a full monthly fee even if user was "frozen" a part -# of the tariffication period -# Parameter: optional -# Values: yes, no -# Default: no -FullFee = yes - -# Allow user to see and use a full cash (yes) or hide a part of it (no) -# for the next fee charge -# Parameter: optional -# Values: yes, no -# Default: yes -# ShowFeeInCash=yes - -# The names of directions. Direction without names will not appear in -# authorizer and configurator. -# Note: Names consisting of several words should be quoted -# Parameter: optional -# Values: - - DirName0 = Internet - DirName1 = - DirName2 = - DirName3 = - DirName4 = - DirName5 = - DirName6 = - DirName7 = - DirName8 = - DirName9 = - - -# Amount of stg-exec processes. -# These processes are responsible for the execution of scripts OnConnect, -# OnDisconnect, etc. -# Amount of processes means how many scripts can be executed simultaneously. -# Recommend to leave 1 to avoid errors when executing scripts -# Parameter: optional -# Value: 1 ... 1024 -# Default: 1 -ExecutersNum = 1 - -# Message queue identifier for the script executer. -# It may be changed if there're a needs to run multiple copies of stargazer. -# Warning: If you do not understand it, do not touch this setting! -# Parameter: optional -# Value: 0 ... 2 ^ 32 -# Default: 5555 -# ExecMsgKey = 5555 - -# The path to directory with server modules -# Parameter: required -# Value: directory path -# Default: /usr/lib/stg -ModulesPath = /usr/lib/stg - -# Directory where the "monitor" files are located. -# A blank files will be created in this directory. The modification time of such -# files will be changed about once a minute. If server crashes or some of server -# component hang, the files will stop refreshing, and on this basis we can define -# the failure of the server and if necessary restart. -# If option is omitted or blank, the monitoring is not performed. -# Parameter: optional -# Value: file path -# Default: /var/stargazer/monitor -#MonitorDir=/var/stargazer/monitor - -################################################################################ -# Store module -# Configure the module that works with the database server - -# Warning: Only one store module could be used at the same time! - - - - - -################################################################################ -# Other modules - - - - - - - -################################################################################ +################################################################################ +# Stargazer Configuration file # +################################################################################ + +# LOG file name +# Parameter: required +# Value: file path +# Default: /var/log/stargazer.log +LogFile = /var/log/stargazer.log + +# PID file name +# Parameter: optional +# Value: file path +# Default: /var/run/stargazer.pid +PIDFile = /var/run/stargazer.pid + +# Traffic classification rules +# Parameter: required +# Value: file path +# Default: /etc/stargazer/rules +Rules = /etc/stargazer/rules + +# The time interval between writing detailed user's statistics into the database +# Note: With a large number of users this value should be increased, +# since writting into the database can take a long time. +# Parameter: required +# Values: 1 (hourly), 1/2 (every half hour), 1/4 (every 15 m), 1/6 (every 10 m) +# Default: 1/2 +DetailStatWritePeriod = 1/2 + +# The time interval between writing summary user's statistics into the database +# Parameter: optional +# Value: 1 ... 1440 (minutes) +# Default: 10 +StatWritePeriod = 10 + +# Day of charging fee +# Note: 0 - The last day of the month +# Parameter: required +# Value: 0 ... 31 +# Default: 1 +DayFee = 1 + +# Fee charged at the last (yes) or first (no) day of tariffication period. +# Defines how the fee will be charged in the transition to the new tariff. +# User has tariff A with fee 100. Changing it to tariff B with fee 200 +# will result in charging user's account at 100 if DayFeeIsLastDay = yes +# and at 200, if DayFeeIsLastDay = no +# Parameter: required +# Values: yes, no +# Default: no +DayFeeIsLastDay = no + +# Day of changing delayed tariffs and resetting summary user's statistics. +# Defines the edge of the tariffication period. +# Parameter: required +# Value: 0 ... 31. 0 - The last day of the month +# Default: 1 +DayResetTraff = 1 + +# Defines whether to charge fee daily (yes) or monthly (no) +# Parameter: required +# Values: yes, no +# Default: no +SpreadFee = no + +# Defines whether the user can access the internet if it has no cash, +# but remained prepaid traffic +# Parameter: required +# Values: yes, no +# Default: no +FreeMbAllowInet = no + +# Defines what will be written in the traffic cost in detail_stat. +# If user still has the prepaid traffic and WriteFreeMbTraffCost = no, +# then the traffic cost willn't be written in detail_stat. +# If user doestn't have prepaid traffic and WriteFreeMbTraffCost = no, +# then the traffic cost will be written in detail_stat. +# When WriteFreeMbTraffCost = yes the traffic cost will be recorded in any case. +# Parameter: required +# Values: yes, no +# Default: yes +WriteFreeMbTraffCost = yes + +# Charge a full monthly fee even if user was "frozen" a part +# of the tariffication period +# Parameter: optional +# Values: yes, no +# Default: no +FullFee = yes + +# Allow user to see and use a full cash (yes) or hide a part of it (no) +# for the next fee charge +# Parameter: optional +# Values: yes, no +# Default: yes +# ShowFeeInCash=yes + +# The names of directions. Direction without names will not appear in +# authorizer and configurator. +# Note: Names consisting of several words should be quoted +# Parameter: optional +# Values: + + DirName0 = Internet + DirName1 = + DirName2 = + DirName3 = + DirName4 = + DirName5 = + DirName6 = + DirName7 = + DirName8 = + DirName9 = + + +# Amount of stg-exec processes. +# These processes are responsible for the execution of scripts OnConnect, +# OnDisconnect, etc. +# Amount of processes means how many scripts can be executed simultaneously. +# Recommend to leave 1 to avoid errors when executing scripts +# Parameter: optional +# Value: 1 ... 1024 +# Default: 1 +ExecutersNum = 1 + +# Message queue identifier for the script executer. +# It may be changed if there're a needs to run multiple copies of stargazer. +# Warning: If you do not understand it, do not touch this setting! +# Parameter: optional +# Value: 0 ... 2 ^ 32 +# Default: 5555 +# ExecMsgKey = 5555 + +# The path to directory with server modules +# Parameter: required +# Value: directory path +# Default: /usr/lib/stg +ModulesPath = /usr/lib/stg + +# Directory where the "monitor" files are located. +# A blank files will be created in this directory. The modification time of such +# files will be changed about once a minute. If server crashes or some of server +# component hang, the files will stop refreshing, and on this basis we can define +# the failure of the server and if necessary restart. +# If option is omitted or blank, the monitoring is not performed. +# Parameter: optional +# Value: file path +# Default: /var/stargazer/monitor +#MonitorDir=/var/stargazer/monitor + +################################################################################ +# Store module +# Configure the module that works with the database server + +# Warning: Only one store module could be used at the same time! + + + + + +################################################################################ +# Other modules + + + + + + + +################################################################################ -- 2.44.2