]>
Commit | Line | Data |
---|---|---|
d6b368b7 AM |
1 | diff -urN demarc-1.05-RC1.org/bin/demarcd demarc-1.05-RC1/bin/demarcd |
2 | --- demarc-1.05-RC1.org/bin/demarcd Sat Sep 1 14:40:42 2001 | |
3 | +++ demarc-1.05-RC1/bin/demarcd Sat Sep 1 14:43:17 2001 | |
4 | @@ -78,7 +78,7 @@ | |
5 | # Get all options from the command line / conf file: | |
6 | getopts("hDi:c:Ff:SkI",\%opts) || &print_usage; | |
7 | &print_usage if $opts{'h'}; | |
8 | -my $config_file = $opts{'f'} || "/usr/local/demarc/conf/demarcd.conf"; | |
9 | +my $config_file = $opts{'f'} || "/etc/demarcd/demarcd.conf"; | |
10 | %conf = &parse_config; | |
11 | ||
12 | ############ | |
13 | @@ -104,12 +104,12 @@ | |
14 | ||
15 | ########## | |
16 | # Path/filename of logfile | |
17 | -my $logfile = &get_config_value("logfile") || "/usr/local/demarc/log/demarcd_log"; | |
18 | +my $logfile = &get_config_value("logfile") || "/var/log/demarcd"; | |
19 | ########## | |
20 | ||
21 | ########## | |
22 | # Path/filename of allowed commands file | |
23 | -my $cmdfile = &get_config_value("cmdfile") || "/usr/local/demarc/conf/regen.cmds"; | |
24 | +my $cmdfile = &get_config_value("cmdfile") || "/etc/demarcd/regen.cmds"; | |
25 | ########## | |
26 | ||
27 | my $temp_binary_directories = &get_config_value("binary_dirs"); | |
28 | @@ -152,7 +152,7 @@ | |
29 | ||
30 | if ($run_snort_locally){ | |
31 | $snort_binary_path = &binary_search($conf{'snort_binary'},"snort"); | |
32 | - $snort_conf_file = $opts{'c'} || &get_config_value("snort_conf_file") || "/usr/local/demarc/conf/snort.conf"; | |
33 | + $snort_conf_file = $opts{'c'} || &get_config_value("snort_conf_file") || "/var/state/demarcd/snort.conf"; | |
34 | $snort_options = &get_config_value("snort_options") || " -o -D -q ";#Special options for snort | |
35 | } | |
36 | ||
37 | diff -urN demarc-1.05-RC1.org/cgi/DEMARC_config.pm demarc-1.05-RC1/cgi/DEMARC_config.pm | |
38 | --- demarc-1.05-RC1.org/cgi/DEMARC_config.pm Sat Sep 1 14:40:42 2001 | |
39 | +++ demarc-1.05-RC1/cgi/DEMARC_config.pm Sat Sep 1 14:44:04 2001 | |
40 | @@ -23,7 +23,7 @@ | |
41 | ||
42 | $conf{'whois_command'} = "/usr/bin/whois"; | |
43 | $conf{'traceroute_command'} = "/usr/sbin/traceroute"; | |
44 | -$conf{'nslookup_command'} = "/usr/sbin/nslookup"; | |
45 | +$conf{'nslookup_command'} = "/usr/bin/nslookup"; | |
46 | $conf{'ping_command'} = "/usr/sbin/ping"; | |
47 | ||
48 | $conf{'allow_anonymous_access'} = 0; | |
49 | diff -urN demarc-1.05-RC1.org/cgi/demarc demarc-1.05-RC1/cgi/demarc | |
50 | --- demarc-1.05-RC1.org/cgi/demarc Sat Sep 1 14:40:42 2001 | |
51 | +++ demarc-1.05-RC1/cgi/demarc Sat Sep 1 14:44:52 2001 | |
52 | @@ -62,7 +62,7 @@ | |
53 | BEGIN{ | |
54 | # CHANGE this to reflect where you have your StaticServices.pm module | |
55 | # which SHOULD be the same as where this script resides | |
56 | - push (@INC,"/usr/local/demarc/cgi"); | |
57 | + push (@INC,"/usr/share/demarc/cgi"); | |
58 | }; | |
59 | ||
60 | use StaticServices; #Make SURE your cgi-bin directory is in your INC array above | |
61 | @@ -116,7 +116,7 @@ | |
62 | my $v_graphics_path = "/dm_images"; | |
63 | my $this_program = "demarc"; | |
64 | my $v_base_path = $conf{'v_base_path'}; | |
65 | -my $base_path = "/usr/local/demarc/cgi"; | |
66 | +my $base_path = "/usr/share/demarc/cgi"; | |
67 | my $template_subdir = "/templates"; | |
68 | my $home_url = "$v_base_path/$this_program"; | |
69 | ############################################## | |
70 | diff -urN demarc-1.05-RC1.org/conf/demarcd.conf demarc-1.05-RC1/conf/demarcd.conf | |
71 | --- demarc-1.05-RC1.org/conf/demarcd.conf Sat Sep 1 14:40:42 2001 | |
72 | +++ demarc-1.05-RC1/conf/demarcd.conf Sat Sep 1 14:46:41 2001 | |
73 | @@ -49,16 +49,16 @@ | |
74 | # | |
75 | ||
76 | # Base path where DEMARC is installed: "/usr/local/demarc" is the default / suggested location | |
77 | -base_path = /usr/local/demarc | |
78 | -config_file = /usr/local/demarc/conf/demarcd.conf | |
79 | -pid_path = /usr/local/demarc/run | |
80 | +base_path = /usr/share/demarc | |
81 | +config_file = /etc/demarcd/demarcd.conf | |
82 | +pid_path = /var/run | |
83 | ||
84 | ||
85 | # Path/filename of logfile | |
86 | -logfile = "/usr/local/demarc/log/demarcd_log" | |
87 | +logfile = "/var/log/demarcd" | |
88 | ||
89 | # Path to allowed regenration commands/users list | |
90 | -cmdfile = "/usr/local/demarc/conf/regen.cmds" | |
91 | +cmdfile = "/etc/demarcd/regen.cmds" | |
92 | ||
93 | ||
94 | ############### | |
95 | @@ -68,8 +68,8 @@ | |
96 | run_snort_locally = yes | |
97 | ||
98 | # Paths to snort related files | |
99 | -snort_binary_path = "/usr/local/bin/snort" | |
100 | -snort_conf_file = "/usr/local/demarc/conf/snort.conf" | |
101 | +snort_binary_path = "/usr/sbin/snort" | |
102 | +snort_conf_file = "/var/state/demarcd/snort.conf" | |
103 | ||
104 | # If you have multiple interfaces and want to have snort monitor ONLY one of them, | |
105 | # name the interface you wish to monitor below (ie "eth0") |