producer.xml rewrite with extratables

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

diff --git a/etc/config.properties-dist b/etc/config.properties-dist
index b6d9dc4..958d98f 100755 (executable)
--- a/etc/config.properties-dist
+++ b/etc/config.properties-dist
@@ -46,9 +46,14 @@ Mir.Tech-email.name=mir-coders mailinglist
 Mir.Public-email.address=mir-coders@lists.indymedia.org
 Mir.Public-email.name=mir-coders mailinglist
 
-Mir.Version=1.1beta
 DirectOpenposting=yes
 
+# Default timezone to display times in in admin, producers
+Mir.DefaultTimezone= UTC
+
+# Default date/time format
+Mir.DefaultDateTimeFormat = yyyy-MM-dd HH:mm
+
 #where to put the lucene index
 IndexPath=/tmp/index
 
@@ -60,7 +65,6 @@ Log.log4j.ConfigurationFile = etc/log4j.properties
 Log.Home = log
 
 Mir.Localizer=mircoders.localizer.basic.MirBasicLocalizer
-Mir.Localizer.Logfile=log/localizer.log
 
 # The location of the producer specifiations
 Mir.Localizer.ProducerConfigFile=etc/producer/producers.xml
@@ -69,11 +73,14 @@ Mir.Localizer.ProducerConfigFile=etc/producer/producers.xml
 # If the default language is left empty, it will set the accept-language of
 # the client browser as the default.
 Mir.Login.DefaultLanguage=en
-Mir.Login.Languages=en;nl;de;qu;tr;ay;es;eu
+Mir.Login.Languages=en;de;fr;nl;es;pt;eu;sv;tr;zh;gz
 
 # For missing values, the FallbackLanguage is used as default
 Mir.Admin.FallbackLanguage=en
 
+# Show who's logged in?
+Mir.Admin.ShowLoggedinUsers=1
+
 # the templates
 Mir.Localizer.Producer.GeneratorLibrary= default=freemarker(etc/producer/)
 Mir.Localizer.Admin.GeneratorLibrary= default=freemarker(templates/admin/)
@@ -99,9 +106,9 @@ Mir.Localizer.Admin.AllowDeleteComment=1
 Mir.Localizer.Admin.AllowDeleteArticle=1
 
 
-# Article Preview Link URL (Link to produced articles from within admin) 
-ContentList.ArticleLink=http://production.indy.code-foo.org/en/${date.formatted.yyyy}/${date.formatted.MM}/${id}.shtml
-CommentList.ArticleLink=http://production.indy.code-foo.org/en/${co_content.date.formatted.yyyy}/${to_content.date.formatted.MM}/${to_content.id}.shtml
+# Article Preview Link URL (Link to produced articles from within admin)
+Comment.PublicUrl=http://production.indy.code-foo.org/en/${date.formatted.yyyy}/${date.formatted.MM}/${id}.shtml
+Article.PublicUrl=http://production.indy.code-foo.org/en/${co_content.date.formatted.yyyy}/${to_content.date.formatted.MM}/${to_content.id}.shtml
 
 
 # Which producers need to be called after an article (resp. a comment) is posted
@@ -111,13 +118,6 @@ Mir.Localizer.OpenPosting.CommentProducers= articles.changed;synchronization.run
 # Which producers need to be called after the "produce all new" link is clicked from admin
 Mir.Localizer.Producer.AllNewProducers= media.new;articles.changed;startpage.run;synchronization.run
 
-
-#note that you can't make pdf's without making fo's
-#this is actually now set in producers.xml
-#but these summarize what is said in there for the benefit of OpenMir 
-GenerateFO=yes
-GeneratePDF=yes
-
 #use rsync to mirror the website to a remote-host
 Rsync=no
 Rsync.Script.Path=/var/www/bin/rsync-copy
@@ -140,6 +140,9 @@ ServletModule.OpenIndy.DefaultMediaUploadItems=1
 # the url of the static site
 Producer.ProductionHost=http://indy.code-fu.de
 
+# the url of the public site
+Producer.PublicationHost=http://indy.code-fu.de
+
 # Produrce.StorageRoot is the directory, in which
 # the generated HTML pages will be stored
 Producer.StorageRoot=/pub/Dokumente/Indymedia/de-tech/Mir/produced
@@ -149,7 +152,7 @@ Producer.StorageRoot=/pub/Dokumente/Indymedia/de-tech/Mir/produced
 #   format:
 #      <name>:<path>:<file filter>:<0|1 (recursion off or on)> [, ....]
 ServletModule.FileEdit.Configuration= \
-  includes:/pub/Dokumente/Indymedia/de-tech/Mir/produced:.*\\.inc:1
+  includes:/pub/Dokumente/Indymedia/de-tech/Mir/produced/inc:.*\\.inc:1
 
 
 #
@@ -249,9 +252,6 @@ PDF.Footer=Indymedia does blah.  Content is good, and free to use for non-commer
 
 PDF.PageSize=A4
 
-
-
-
 #
 # edit with caution below this line
 ######################################################################
@@ -273,22 +273,9 @@ Database.Username=postgres
 Database.Password=
 Database.Host=localhost
 Database.Name=Mir
+Database.Port=5432
+Database.Driver=org.postgresql.Driver
 
-#
-# this sets the adaptor to be used
-
-Database.Adaptor=mir.storage.DatabaseAdaptorPostgresql
-Database.Logfile=log/dbentity.log
-
-#
-# configuration for adaptor postgres
-# In this example, "Mir" is the dbname
-
-Adaptor.PostgreSQL.URL=jdbc:postgresql://localhost:5432/Mir
-Adaptor.PostgreSQL.Driver=org.postgresql.Driver
-
-# how many articles should be shown on a list-page
-Lists.Max.Items=10
 
 #
 # Servlet / Module configurations
@@ -299,3 +286,8 @@ Lists.Max.Items=10
 # as the dynamic output html.
 # also used for the HTML charset meta tag.
 Mir.DefaultEncoding=UTF8
+
+# this encoding is used for the HTML charset meta tag.
+# it must be the html charset equivalent of the Java encoding above
+# don't change this unless...
+Mir.DefaultHTMLCharset=UTF-8