Reverted some unvanted changes.

diff --git a/projects/convertor/convertor.conf b/projects/convertor/convertor.conf
index ab8e8e8dba9db7fae9f19d2a5c895a809c06e23f..41e18b6823f087e3b7755b08822b997703f8b882 100644 (file)
--- a/projects/convertor/convertor.conf
+++ b/projects/convertor/convertor.conf
@@ -6,9 +6,10 @@
 # Parameter: required
 # Value: directory path
 # Default: /usr/lib/stg
 # Parameter: required
 # Value: directory path
 # Default: /usr/lib/stg

-ModulesPath = ../stargazer/modules
+ModulesPath = /usr/lib/stg

 
 

-#################################################################################Store module
+#################################################################################
+Store module

 # Configure the module that works with the database server
 # 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
 # Configure the module that works with the database server
 # 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


@@ -17,7 +18,7 @@ ModulesPath = ../stargazer/modules
     # Working server directory, provides data on tariffs, users, administrators.
     # Parameter: required
     # Value: directory path
     # Working server directory, provides data on tariffs, users, administrators.
     # Parameter: required
     # Value: directory path

-    WorkDir = ../stargazer/var/stargazer
+    WorkDir = /var/stargazer

 
     # Owner, group and permissions of the files of user statistics (stat)
     # Parameter: required
 
     # Owner, group and permissions of the files of user statistics (stat)
     # Parameter: required


@@ -47,77 +48,77 @@ ModulesPath = ../stargazer/modules
     # Parameter: required
     # Value: IP address or DNS name
     # Default: localhost
     # Parameter: required
     # Value: IP address or DNS name
     # Default: localhost

-#     server = localhost
+    # server = localhost

 
     # Path to the database on the server or its alias
     # Parameter: required
     # Value: file path
     # Default: /var/stg/stargazer.fdb
 
     # Path to the database on the server or its alias
     # Parameter: required
     # Value: file path
     # Default: /var/stg/stargazer.fdb

-#     database = /var/stg/stargazer.fdb
+    # database = /var/stg/stargazer.fdb

 
     # Database username
     # Parameter: required
     # Value: any, supported by database
     # Default: stg
 
     # Database username
     # Parameter: required
     # Value: any, supported by database
     # Default: stg

-#     user = stg
+    # user = stg

 
     # Database password
     # Parameter: required
     # Value: any, supported by database
     # Default: 123456
 
     # Database password
     # Parameter: required
     # Value: any, supported by database
     # Default: 123456

-#     password = 123456
+    # password = 123456

 #</DestStoreModule>
 
 #</DestStoreModule>
 

-#<DestStoreModule store_postgresql>
+<DestStoreModule store_postgresql>

     # Database server address
     # Parameter: required
     # Value: IP address or DNS name
     # Default: localhost
     # Database server address
     # Parameter: required
     # Value: IP address or DNS name
     # Default: localhost

-#    server = altair.local
+    server = localhost

 
     # Database name
     # Parameter: required
     # Value: any, supported by database
     # Default: stargazer
 
     # Database name
     # Parameter: required
     # Value: any, supported by database
     # Default: stargazer

-#    database = stg
+    database = stargazer

 
     # Database username
     # Parameter: mandatory
     # Value: any, supported by database
     # Default: stg
 
     # Database username
     # Parameter: mandatory
     # Value: any, supported by database
     # Default: stg

-#    user = stg
+    user = stg

 
     # Database password
     # Parameter: required
     # Value: any, supported by database
     # Default: 123456
 
     # Database password
     # Parameter: required
     # Value: any, supported by database
     # Default: 123456

-#    password = 123456
+    password = 123456

 
 

-#</DestStoreModule>
+</DestStoreModule>

 
 

-<DestStoreModule store_mysql>
+#<DestStoreModule store_mysql>

     # Database server address
     # Parameter: required
     # Value: IP address or DNS name
     # Default: localhost
     # Database server address
     # Parameter: required
     # Value: IP address or DNS name
     # Default: localhost

-     dbhost = altair.local
+    # dbhost = localhost

 
     # Database name
     # Parameter: required
     # Value: any, supported by database
     # Default: stg
 
     # Database name
     # Parameter: required
     # Value: any, supported by database
     # Default: stg

-     dbname = stg
+    # dbname = stg

 
     # Database username
     # Parameter: required
     # Value: any, supported by database
     # Default: stg
 
     # Database username
     # Parameter: required
     # Value: any, supported by database
     # Default: stg

-     dbuser = stg
+    # dbuser = stg

 
     # Database password
     # Parameter: required
     # Value: any, supported by database
     # Default: 123456
 
     # Database password
     # Parameter: required
     # Value: any, supported by database
     # Default: 123456

-     rootdbpass = 123456
+    # rootdbpass = 123456

 
 

-</DestStoreModule>
+#</DestStoreModule>

diff --git a/projects/stargazer/build b/projects/stargazer/build
index 3a57e70e962b1a64e0a46e9eea12038aaa40bb0e..60c8e1ff035e4c07008c3cec1c62146fbf9f084a 100755 (executable)
--- a/projects/stargazer/build
+++ b/projects/stargazer/build
@@ -113,7 +113,8 @@ if [ "$OS" = "linux" ]
 then
     DEFS="$DEFS -DLINUX"
     PLUGINS="$PLUGINS
 then
     DEFS="$DEFS -DLINUX"
     PLUGINS="$PLUGINS

-             capture/ether_linux"
+             capture/ether_linux
+             capture/ipq_linux"

     LIB_THREAD=-lpthread
 else
     if [ "$OS" = "bsd" ]
     LIB_THREAD=-lpthread
 else
     if [ "$OS" = "bsd" ]