summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-09-25 02:51:03 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-09-25 02:51:03 +0000
commit81b0dff16654dd67bc15937bd653fc3f65475359 (patch)
tree7996b36b04f8a831b051142c251ad0b522e5b200 /config
parente32557bf900153c5cfb0d2f28640aa9091ef7488 (diff)
downloadampache-81b0dff16654dd67bc15937bd653fc3f65475359.tar.gz
ampache-81b0dff16654dd67bc15937bd653fc3f65475359.tar.bz2
ampache-81b0dff16654dd67bc15937bd653fc3f65475359.zip
track ip history, fix pagination on admin/user and fix some acl stuff that I forgot about
Diffstat (limited to 'config')
-rw-r--r--config/ampache.cfg.php.dist22
1 files changed, 15 insertions, 7 deletions
diff --git a/config/ampache.cfg.php.dist b/config/ampache.cfg.php.dist
index f91d3be8..839631b8 100644
--- a/config/ampache.cfg.php.dist
+++ b/config/ampache.cfg.php.dist
@@ -85,6 +85,20 @@ site_title = "Ampache :: For The Love Of Music"
# DEFAULT: true
require_session = "true"
+# Track User IPs
+# If this is enabled Ampache will log the IP of every completed login
+# it will store user,ip,time at one row per login. The results are
+# displayed in Admin --> Users
+# DEFAULT: false
+#track_user_ip = "false"
+
+# User IP Cardinality
+# This defines how many days worth of IP history Ampache will track
+# As it is one row per login on high volume sites you will want to
+# clear it every now and then.
+# DEFAULT: 42 days
+#user_ip_cardinality = "42"
+
# Use XML-RPC
# Allow XML-RPC connections, if you don't want _any_ possibility of your
# catalog being streamed from another location comment this out
@@ -332,12 +346,6 @@ allow_stream_playback = true
# DEFAULT: false
#allow_downsample_playback = false
-# LocalPlay Playback
-# Disable this if you don't want to allow people to pick the
-# local playback method
-# DEFAULT: false
-#allow_local_playback = false
-
#########################################################
# These options control the dynamic down-sampling based #
# on current usage #
@@ -422,7 +430,7 @@ transcode_m4a = true
# These are the commands that will be run to transcode the file
#stream_cmd_flac = flac -dc %FILE% | lame -r -b 128 -S - -
-#stream_cmd_m4a = faad -f 2 -w "%FILE%" | lame -r -b 128 -S - -
+stream_cmd_m4a = faad -f 2 -w "%FILE%" | lame -r -b 128 -S - -
#stream_cmd_mpc =
#######################################################