Add more comments in the admin.conf file

diff --git a/Changelog b/Changelog
index 9a61695e8c53e838f2e2eb848988a54352d718f2..beacd143f185dac2fac2490f19e90b29fdc0bcb9 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -47,6 +47,7 @@ Ver 1.63:
 * Add a configuration directive counter_monthly_calculate_usage to calculate the monthly usage time. Calculate
   it in user_admin if monthly_limit != 'none' or if this directive is set.
   Based on a report by "apellido jr., wilfredo p"
+* Add more comments in the admin.conf file
 Ver 1.62:
 * Remove one sql query from user_admin which was not needed.
 * Instead of a query like "LIKE 'YYYY-MM-DD%'" use "AcctStopTime >= 'YYYY-MM-DD 00:00:00 AND AcctStopTime

diff --git a/conf/admin.conf b/conf/admin.conf
index 4df7d4a4e8b16e0060b3f31f177067866304addc..74a99fa98e8f3122398ea06b60aa2ee84bd3cedd 100644 (file)
--- a/conf/admin.conf
+++ b/conf/admin.conf
@@ -5,8 +5,8 @@
 # from non latin alphabet languages
 # These attribute only apply for ldap not for sql
 #
-general_prefered_lang: el
-general_prefered_lang_name: Greek
+general_prefered_lang: en
+general_prefered_lang_name: English
 #
 # The charset which will be added as a meta tag in all pages
 #
@@ -17,7 +17,12 @@ general_charset: iso-8859-1
 #
 #general_decode_normal_attributes: yes
 #
+# The directory where dialupadmin is installed
+#
 general_base_dir: /usr/local/dialup_admin
+#
+# The base directory of the freeradius radius installation
+#
 general_radiusd_base_dir: /usr/local/radiusd
 general_domain: company.com
 #
@@ -59,15 +64,26 @@ general_sql_attrmap: %{general_base_dir}/conf/sql.attrmap
 general_extra_ldap_attrmap: %{general_base_dir}/conf/extra.ldap-attrmap
 #
 # it can be either ldap or sql
+# This affects the user base not accounting. Accounting is always in sql
 #
 general_lib_type: sql
+#
+# Define which attributes will be visible in the user edit page
+#
 general_user_edit_attrs_file: %{general_base_dir}/conf/user_edit.attrs
+#
+# Used by the Accounting Report Generator
+#
 general_sql_attrs_file: %{general_base_dir}/conf/sql.attrs
+#
+# Set default values for various attributes
+#
 general_default_file: %{general_base_dir}/conf/default.vals
 #general_ld_library_path: /usr/local/snmpd/lib
 #
 # can be 'snmp' (for snmpfinger) or empty to query the radacct table without first
 # querying the nas
+# This is used by the online users page
 #
 general_finger_type: snmp
 general_snmpfinger_bin: %{general_base_dir}/bin/snmpfinger
@@ -98,8 +114,14 @@ general_auth_request_file: %{general_base_dir}/conf/auth.request
 general_encryption_method: crypt
 #
 # can be either asc (older dates first) or desc (recent dates first)
+# This is used in the user accounting page
 #
 general_accounting_info_order: desc
+#
+# Use the totacct table in the user statistics page instead of the radacct
+# table. That will make the page run quicker. totacct should have data for
+# this to work :-)
+#
 general_stats_use_totacct: no
 
 nas1_name: nas1.%{general_domain}
@@ -241,6 +263,11 @@ sql_connect_timeout: 3
 # logging bad logins or adding users in the badusers table
 #sql_extra_servers: sql2.company.com sql3.company.com
 
+#
+# Default values for the various user limits in case the counter module
+# is used to impose such limits.
+# The value should be the user limit in seconds or none for nothing
+#
 counter_default_daily: 14400
 counter_default_weekly: 72000
 counter_default_monthly: none