From: Maxim Mamontov <faust.madf@gmail.com>
Date: Wed, 27 Nov 2013 19:52:24 +0000 (+0200)
Subject: Reverted some unvanted changes.
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/a7241d0f167a7af46850091b94c2f4b7fd63efe7?ds=sidebyside;hp=-c

Reverted some unvanted changes.
---

a7241d0f167a7af46850091b94c2f4b7fd63efe7
diff --git a/projects/convertor/convertor.conf b/projects/convertor/convertor.conf
index ab8e8e8d..41e18b68 100644
--- a/projects/convertor/convertor.conf
+++ b/projects/convertor/convertor.conf
@@ -6,9 +6,10 @@
 # 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
@@ -17,7 +18,7 @@ ModulesPath = ../stargazer/modules
     # 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
@@ -47,77 +48,77 @@ ModulesPath = ../stargazer/modules
     # 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
-#     database = /var/stg/stargazer.fdb
+    # database = /var/stg/stargazer.fdb
 
     # 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
-#     password = 123456
+    # password = 123456
 #</DestStoreModule>
 
-#<DestStoreModule store_postgresql>
+<DestStoreModule store_postgresql>
     # 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 = stg
+    database = stargazer
 
     # 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
-#    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
-     dbhost = altair.local
+    # dbhost = localhost
 
     # 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
-     dbuser = stg
+    # dbuser = stg
 
     # 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 3a57e70e..60c8e1ff 100755
--- a/projects/stargazer/build
+++ b/projects/stargazer/build
@@ -113,7 +113,8 @@ if [ "$OS" = "linux" ]
 then
     DEFS="$DEFS -DLINUX"
     PLUGINS="$PLUGINS
-             capture/ether_linux"
+             capture/ether_linux
+             capture/ipq_linux"
     LIB_THREAD=-lpthread
 else
     if [ "$OS" = "bsd" ]