1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
diff --git a/nx_util/nx_util.conf b/nx_util/nx_util.conf
index cd2a591..818daaf 100644
--- a/nx_util/nx_util.conf
+++ b/nx_util/nx_util.conf
@@ -1,4 +1,4 @@
[nx_util]
-data_dir=/usr/local/nx_datas
+data_dir=/usr/share/nx_datas
database_dir=
naxsi_core_rules=/etc/nginx/naxsi_core.rules
diff --git a/nx_util/nx_util.py b/nx_util/nx_util.py
old mode 100644
new mode 100755
index 0509b51..38be37e
--- a/nx_util/nx_util.py
+++ b/nx_util/nx_util.py
@@ -62,8 +62,8 @@ if __name__ == "__main__":
# Configuration
parser.add_option("-c", "--config", dest="conf_path",
- help="Path to configuration (defaults to /usr/local/etc/nx_util.conf)",
- type="string", default="/usr/local/etc/nx_util.conf")
+ help="Path to configuration (defaults to /etc/nx_util.conf)",
+ type="string", default="/etc/nx_util.conf")
# Filtering options should go here :)
parser.add_option("-f", "--filters", dest="usr_filter",
diff --git a/nx_util/setup.py b/nx_util/setup.py
index cc48a5c..b855459 100644
--- a/nx_util/setup.py
+++ b/nx_util/setup.py
@@ -8,14 +8,14 @@ setup(name='nx_util',
author='Naxsi Dev Team',
author_email='thibault.koechlin@nbs-system.com',
url='naxsi.googlecode.com',
- scripts=['nx_util.py'],
+ scripts=['nx_util'],
packages=['nx_lib'],
- data_files=[('nx_datas', ['nx_datas/bootstrap.min.css',
+ data_files=[('/usr/share/nx_datas', ['nx_datas/bootstrap.min.css',
'nx_datas/bootstrap-responsive.min.css',
'nx_datas/highcharts.js',
'nx_datas/map.tpl',
'nx_datas/bootstrap.min.js',
'nx_datas/country2coords.txt']),
('/usr/share/man/man1', ['nx_util.1.gz']),
- ('/usr/local/etc/', ['nx_util.conf'])]
+ ('/etc/', ['nx_util.conf'])]
)
|
GitWeb
