merged 1.1 branch into head

[mir.git] / etc / config.properties-dist

diff --git a/etc/config.properties-dist b/etc/config.properties-dist
index e7c7d5c..64b3359 100755 (executable)
--- a/etc/config.properties-dist
+++ b/etc/config.properties-dist
@@ -3,6 +3,12 @@
 # by Matthias <mjordan@code-fu.de> 2001-09-12
 # reorganized by <init@nadir.org>  2003-02-12
 #
+# The options shown here are the more frequently used options.  A full
+# list    of   all    default    options   is    available   in    the
+# source/default.properties file. If you  need to change any of those,
+# just  override   the  values  in  *this*  file   (don't  change  the
+# source/default.properties file
+#
 # The Mir software realizes a semi-dynamic web service:
 # The web server that is accessed by readers has pure static
 # pages. These pages are generated by the Mir software that
@@ -65,38 +71,19 @@ Mir.DefaultTimezone= UTC
 # http://java.sun.com/j2se/1.3/docs/api/java/text/SimpleDateFormat.html
 Mir.DefaultDateTimeFormat = yyyy-MM-dd HH:mm
 
-# where to put the lucene index
-# for the build in searchengine
-# (must be creatable and writable by the tomcat user)
-IndexPath=index
-
-# temp-dir used for media-uploads
-TempDir=/tmp
-
-# Logging
-#
-Log.LogClass = mir.log.log4j.LoggerImpl
-Log.log4j.ConfigurationFile = etc/log4j.properties
-Log.Home = log
-
-# Mir.Localizer
-# for your additional site-specific java-code
-#
-Mir.Localizer=mircoders.localizer.basic.MirBasicLocalizer
-
-# The location of the producer specifiations
-#
-Mir.Localizer.ProducerConfigFile=etc/producer/producers.xml
-
 # For missing values, the FallbackLanguage is used as default
 #
 Mir.Admin.FallbackLanguage=en
 
-# the templates
+# warning: advanced feature. Don't change unless you know
+# Localizers provide  a customization framework  that allows different
+# mir sites to  behave differently. Each site can  write it's own bits
+# of  java  code  that   override  default  behavior.   The  localizer
+# framework  provides "hooks" where  admins can  plug in  their custom
+# code.
 #
-Mir.Localizer.Producer.GeneratorLibrary= default=freemarker(etc/producer/)
-Mir.Localizer.Admin.GeneratorLibrary= default=freemarker(templates/admin/)
-Mir.Localizer.OpenPosting.GeneratorLibrary= default=freemarker(etc/open/)
+# example setup:
+# Mir.Localizer=org.indymedia.de.DeLocalizer
 
 
 #################################
@@ -114,36 +101,11 @@ Mir.Login.Languages=en;de;fr;nl;es;pt;eu;sv;tr;zh;gz
 #
 Mir.Admin.ShowLoggedinUsers=1
 
-# How should the custom operations (hide etc) in article and comment lists
-# be presented?
-# 0 = links, 1 = checkboxes, 2 = a listbox
-#
-Mir.Localizer.Admin.ListOperationsFlavor=1
-
-# How should the topics be presented on the article edit page?
-# 0 = in a multiselect list box, 1 = checkboxes
-#
-Mir.Localizer.Admin.TopicListFlavor=1
-
-# For the checkboxes flavour, how many columns should there be?
-#
-Mir.Localizer.Admin.TopicListColumns=3
-
-# In which order should the topic appear?
-#
-Mir.Localizer.Admin.TopicListOrder=title
-
 # enable deletion of comments/articles?
 #
 Mir.Localizer.Admin.AllowDeleteComment=1
 Mir.Localizer.Admin.AllowDeleteArticle=1
 
-# Article Preview Link URL (Link to produced articles from within admin)
-#
-Article.PublicUrl=http://mir.code-foo.org/en/${to_content.date.formatted.yyyy}/${to_content.date.formatted.MM}/${to_content.id}.shtml
-Comment.PublicUrl=http://mir.code-foo.org/en/${date.formatted.yyyy}/${date.formatted.MM}/${id}.shtml
-
-
 #######################
 # automated producers #
 #######################
@@ -187,9 +149,6 @@ Rsync.Script.Path=/var/www/bin/rsync-copy.sh
 ServletModule.FileEdit.Configuration= \
   includes:/var/www/project/site/includes:.*\\.inc:1
 
-
-
-
 ################################################
 ###########  B) STATIC SITE CONFIG #############
 ################################################
@@ -333,6 +292,12 @@ ServletModule.OpenIndy.MaxMediaUploadItems=20
 #
 ServletModule.OpenIndy.DefaultMediaUploadItems=1
 
+# path to ImageMagick executables. Default is "" (nothing), which 
+# means executables will be searched using the default system PATH
+# example:Producer.Image.ImageMagickPath=/usr/local/ImageMagick/bin
+#
+Producer.Image.ImageMagickPath=
+
 
 ######################
 # PDF configurations #
@@ -366,9 +331,9 @@ PDF.PageSize=A4
 
 # specify your database
 #
-Database.Name=Mir
-Database.Username=postgres
-Database.Password=
+Database.Name=mir
+Database.Username=mir
+Database.Password=indymedia
 
 Database.Host=localhost
 Database.Port=5432