From ea169a2ed1db96a03b6e7ea907931bb640820208 Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Fri, 11 Jan 2013 20:40:33 +0200 Subject: [PATCH] Fixes in configuration files. --- .../conf-available.d/mod_cap_nf.conf | 6 +++--- .../stargazer/conf-available.d/mod_ia.conf | 4 ++-- .../conf-available.d/mod_remote_script.conf | 4 ++-- .../stargazer/conf-available.d/mod_rpc.conf | 6 +++--- .../stargazer/conf-available.d/mod_smux.conf | 7 ++++--- .../conf-available.d/store_files.conf | 3 +-- .../conf-available.d/store_firebird.conf | 21 ++++++++++--------- .../conf-available.d/store_mysql.conf | 1 + .../conf-available.d/store_postgresql.conf | 17 ++++++++------- .../conf-available.d/mod_cap_nf.conf | 6 +++--- .../stargazer/conf-available.d/mod_ia.conf | 4 ++-- .../conf-available.d/mod_remote_script.conf | 4 ++-- .../stargazer/conf-available.d/mod_rpc.conf | 6 +++--- .../stargazer/conf-available.d/mod_smux.conf | 7 ++++--- .../conf-available.d/store_files.conf | 3 +-- .../conf-available.d/store_firebird.conf | 21 ++++++++++--------- .../conf-available.d/store_mysql.conf | 1 + .../conf-available.d/store_postgresql.conf | 17 ++++++++------- 18 files changed, 72 insertions(+), 66 deletions(-) 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 f3cbc40c..948674ca 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 @@ -3,14 +3,14 @@ # Port for TCP connections # Note: Parameters TCPPort and UDPPort can be equal # Parameter: optional - # Value: 1 ... 65534 + # Value: 1 ... 65535 # Default: 9996 #TCPPort = 9996 # Port for UDP connections # Note: Parameters TCPPort and UDPPort can be equal # Parameter: optional - # Value: 1 ... 65536 + # Value: 1 ... 65535 # 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 aa18309a..69b5eae3 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 @@ -2,7 +2,7 @@ # Port on which the server interacts with authorizator # Parameter: required - # Value: 1 ... 65534 + # Value: 1 ... 65535 # Default: 5555 Port = 5555 @@ -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_remote_script.conf b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_remote_script.conf index b3d0ab76..a71350c8 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 @@ -14,7 +14,7 @@ # 192.168.3.0/24 192.168.3.5 # 192.168.4.0/24 192.168.4.5 # Parametr: required - # Values: filename + # Values: file path # Default: subnets SubnetFile = subnets @@ -39,4 +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 06eeba4e..b05695a7 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 @@ -6,9 +6,9 @@ # Default: Port = 8080 - # Session timeout + # Session timeout in seconds # Parameter: required - # Value: any numeric + # Value: positive integer # Default: 1800 CookieTimeout = 1800 - \ No newline at end of file + diff --git a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_smux.conf b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_smux.conf index 924cc636..84ce24bb 100644 --- a/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_smux.conf +++ b/projects/stargazer/inst/freebsd/etc/stargazer/conf-available.d/mod_smux.conf @@ -1,3 +1,4 @@ +# Enables SMUX-peer for SNMPd. # IP-address of a server to connect to # Parameter: required @@ -12,7 +13,7 @@ Port = 199 # Password for authentication on a server - # Parameter: optional - # - # Password = 123456 + # Parameter: required + # Value: any text + Password = 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 068d4aba..f7e0f23d 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,5 +1,4 @@ -# 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 +# Enables plain file backend. # Working server directory, provides data on tariffs, users, administrators. 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 738d75cc..39e4ad3d 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 @@ -1,37 +1,38 @@ +# Enables Firebird backend. # Database server address - # Parameter: required + # Parameter: optional # Value: IP address or DNS name # Default: localhost - Server = localhost + # Server = localhost # Path to the database on the server or its alias - # Parameter: required + # Parameter: optional # Value: file path # Default: /var/stg/stargazer.fdb - Database = /var/stg/stargazer.fdb + # Database = /var/stg/stargazer.fdb # Database username - # Parameter: required + # Parameter: optional # Value: any, supported by database # Default: stg - User = stg + # User = stg # Database password - # Parameter: required + # Parameter: optional # Value: any, supported by database # Default: 123456 - Password = 123456 + # Password = 123456 # The transaction isolation level # Parameter: optional # Values: concurrency, dirtyread, readcommitted, consistency # Defalt: concurrency - IsolationLevel = concurrency + # IsolationLevel = concurrency # Responding to lock (optional, defaults to wait): # Parameter: optional # Values: wait, nowait # Defalt: wait - LockResolution = wait + # LockResolution = wait 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 a5cc4180..a5b2126d 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 @@ -1,3 +1,4 @@ +# Enables MySQL backend. # Database server address # Parameter: required 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 15326584..8a52c75b 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 @@ -1,27 +1,28 @@ +# Enables PostgreSQL backend. # Database server address - # Parameter: required + # Parameter: optional # Value: IP address or DNS name # Default: localhost - Server = localhost + # Server = localhost # Database name - # Parameter: required + # Parameter: optional # Value: any, supported by database # Default: stargazer - Database = stargazer + # Database = stargazer # Database username - # Parameter: mandatory + # Parameter: optional # Value: any, supported by database # Default: stg - User = stg + # User = stg # Database password - # Parameter: required + # Parameter: optional # Value: any, supported by database # Default: 123456 - Password = 123456 + # Password = 123456 # Number of tries to reconnect # Parameter: optional 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 f3cbc40c..948674ca 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 @@ -3,14 +3,14 @@ # Port for TCP connections # Note: Parameters TCPPort and UDPPort can be equal # Parameter: optional - # Value: 1 ... 65534 + # Value: 1 ... 65535 # Default: 9996 #TCPPort = 9996 # Port for UDP connections # Note: Parameters TCPPort and UDPPort can be equal # Parameter: optional - # Value: 1 ... 65536 + # Value: 1 ... 65535 # 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 aa18309a..69b5eae3 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 @@ -2,7 +2,7 @@ # Port on which the server interacts with authorizator # Parameter: required - # Value: 1 ... 65534 + # Value: 1 ... 65535 # Default: 5555 Port = 5555 @@ -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_remote_script.conf b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_remote_script.conf index b3d0ab76..a71350c8 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 @@ -14,7 +14,7 @@ # 192.168.3.0/24 192.168.3.5 # 192.168.4.0/24 192.168.4.5 # Parametr: required - # Values: filename + # Values: file path # Default: subnets SubnetFile = subnets @@ -39,4 +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 06eeba4e..b05695a7 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 @@ -6,9 +6,9 @@ # Default: Port = 8080 - # Session timeout + # Session timeout in seconds # Parameter: required - # Value: any numeric + # Value: positive integer # Default: 1800 CookieTimeout = 1800 - \ No newline at end of file + diff --git a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_smux.conf b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_smux.conf index 924cc636..84ce24bb 100644 --- a/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_smux.conf +++ b/projects/stargazer/inst/linux/etc/stargazer/conf-available.d/mod_smux.conf @@ -1,3 +1,4 @@ +# Enables SMUX-peer for SNMPd. # IP-address of a server to connect to # Parameter: required @@ -12,7 +13,7 @@ Port = 199 # Password for authentication on a server - # Parameter: optional - # - # Password = 123456 + # Parameter: required + # Value: any text + Password = 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 068d4aba..f7e0f23d 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,5 +1,4 @@ -# 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 +# Enables plain file backend. # Working server directory, provides data on tariffs, users, administrators. 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 738d75cc..39e4ad3d 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 @@ -1,37 +1,38 @@ +# Enables Firebird backend. # Database server address - # Parameter: required + # Parameter: optional # Value: IP address or DNS name # Default: localhost - Server = localhost + # Server = localhost # Path to the database on the server or its alias - # Parameter: required + # Parameter: optional # Value: file path # Default: /var/stg/stargazer.fdb - Database = /var/stg/stargazer.fdb + # Database = /var/stg/stargazer.fdb # Database username - # Parameter: required + # Parameter: optional # Value: any, supported by database # Default: stg - User = stg + # User = stg # Database password - # Parameter: required + # Parameter: optional # Value: any, supported by database # Default: 123456 - Password = 123456 + # Password = 123456 # The transaction isolation level # Parameter: optional # Values: concurrency, dirtyread, readcommitted, consistency # Defalt: concurrency - IsolationLevel = concurrency + # IsolationLevel = concurrency # Responding to lock (optional, defaults to wait): # Parameter: optional # Values: wait, nowait # Defalt: wait - LockResolution = wait + # LockResolution = wait 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 a5cc4180..a5b2126d 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 @@ -1,3 +1,4 @@ +# Enables MySQL backend. # Database server address # Parameter: required 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 15326584..8a52c75b 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 @@ -1,27 +1,28 @@ +# Enables PostgreSQL backend. # Database server address - # Parameter: required + # Parameter: optional # Value: IP address or DNS name # Default: localhost - Server = localhost + # Server = localhost # Database name - # Parameter: required + # Parameter: optional # Value: any, supported by database # Default: stargazer - Database = stargazer + # Database = stargazer # Database username - # Parameter: mandatory + # Parameter: optional # Value: any, supported by database # Default: stg - User = stg + # User = stg # Database password - # Parameter: required + # Parameter: optional # Value: any, supported by database # Default: 123456 - Password = 123456 + # Password = 123456 # Number of tries to reconnect # Parameter: optional -- 2.44.2