1 --- dialup_admin/bin/clean_radacct
2 +++ dialup_admin/bin/clean_radacct
7 -$conf=shift||'/usr/local/dialup_admin/conf/admin.conf';
8 +$conf=shift||'/usr/share/dialup_admin/conf/admin.conf';
12 --- dialup_admin/bin/dialup_admin.cron
13 +++ dialup_admin/bin/dialup_admin.cron
15 -1 0 * * * /usr/local/dialup_admin/bin/tot_stats >/dev/null 2>&1
16 -5 0 * * * /usr/local/dialup_admin/bin/monthly_tot_stats >/dev/null 2>&1
17 -10 0 1 * * /usr/local/dialup_admin/bin/truncate_radacct >/dev/null 2>&1
18 -15 0 1 * * /usr/local/dialup_admin/bin/clean_radacct >/dev/null 2>&1
19 +1 0 * * * /usr/share/dialup_admin/bin/tot_stats >/dev/null 2>&1
20 +5 0 * * * /usr/share/dialup_admin/bin/monthly_tot_stats >/dev/null 2>&1
21 +10 0 1 * * /usr/share/dialup_admin/bin/truncate_radacct >/dev/null 2>&1
22 +15 0 1 * * /usr/share/dialup_admin/bin/clean_radacct >/dev/null 2>&1
23 --- dialup_admin/bin/log_badlogins
24 +++ dialup_admin/bin/log_badlogins
29 -$conf=shift||'/usr/local/dialup_admin/conf/admin.conf';
30 +$conf=shift||'/usr/share/dialup_admin/conf/admin.conf';
31 $all_file=shift||'no';
33 # Uncomment to force inserts even if there are sql errors. That can
34 --- dialup_admin/bin/monthly_tot_stats
35 +++ dialup_admin/bin/monthly_tot_stats
37 # Works only with mysql and postgresql
40 -$conf=shift||'/usr/local/dialup_admin/conf/admin.conf';
41 +$conf=shift||'/usr/share/dialup_admin/conf/admin.conf';
45 --- dialup_admin/bin/showmodem
46 +++ dialup_admin/bin/showmodem
48 $comm=shift || "public";
51 -$conf='/usr/local/dialup_admin/conf/admin.conf';
52 +$conf='/usr/share/dialup_admin/conf/admin.conf';
54 or die "Could not open configuration file\n";
56 --- dialup_admin/bin/snmpfinger
57 +++ dialup_admin/bin/snmpfinger
59 $comm=shift || 'public';
60 $type=shift || 'cisco';
62 -$conf='/usr/local/dialup_admin/conf/admin.conf';
63 +$conf='/usr/share/dialup_admin/conf/admin.conf';
65 or die "Could not open configuration file\n";
67 --- dialup_admin/bin/tot_stats
68 +++ dialup_admin/bin/tot_stats
70 # Works with mysql and postgresql
73 -$conf=shift||'/usr/local/dialup_admin/conf/admin.conf';
74 +$conf=shift||'/usr/share/dialup_admin/conf/admin.conf';
78 --- dialup_admin/bin/truncate_radacct
79 +++ dialup_admin/bin/truncate_radacct
84 -$conf=shift||'/usr/local/dialup_admin/conf/admin.conf';
85 +$conf=shift||'/usr/share/dialup_admin/conf/admin.conf';
89 --- dialup_admin/conf/admin.conf
90 +++ dialup_admin/conf/admin.conf
93 # The directory where dialupadmin is installed
95 -general_base_dir: /usr/local/dialup_admin
96 +general_base_dir: /usr/share/dialup_admin
98 # The base directory of the freeradius radius installation
100 -general_radiusd_base_dir: /usr/local/radiusd
101 +general_radiusd_base_dir: /
102 general_domain: company.com
104 # Set it to yes to use sessions and cache the various mappings
106 general_raddb_dir: %{general_radiusd_base_dir}/etc/raddb
107 general_ldap_attrmap: %{general_raddb_dir}/ldap.attrmap
108 # Need to fix admin.conf file parser
109 -#general_clients_conf: %{general_raddb_dir}/clients.conf
110 -general_clients_conf: /usr/local/etc/raddb/clients.conf
111 +general_clients_conf: %{general_raddb_dir}/clients.conf
112 +#general_clients_conf: /usr/local/etc/raddb/clients.conf
113 general_sql_attrmap: %{general_base_dir}/conf/sql.attrmap
114 general_accounting_attrs_file: %{general_base_dir}/conf/accounting.attrs
115 general_extra_ldap_attrmap: %{general_base_dir}/conf/extra.ldap-attrmap
116 @@ -235,19 +235,19 @@
117 # This variable is used by the scripts in the bin folder
118 # It should contain the path to the sql binary used to run
119 # sql commands (mysql and psql are only supported for now)
120 -sql_command: /usr/local/bin/mysql
121 +sql_command: /usr/bin/mysql
123 # This variable is used by the scripts in the bin folder
124 # It should contain the snmp type and path to the binary
125 # used to run snmp commands.
126 # (ucd = UCD-Snmp and net = Net-Snmp are only supported for now)
127 general_snmp_type: net
128 -general_snmpwalk_command: /usr/local/bin/snmpwalk
129 -general_snmpget_command: /usr/local/bin/snmpget
130 +general_snmpwalk_command: /usr/bin/snmpwalk
131 +general_snmpget_command: /usr/bin/snmpget
133 # Uncomment to enable sql debug
138 # If set to yes then the HTTP credentials (http authentication)
139 # will be used to connect to the sql server instead of sql_username