projects
/
mir.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed the behaviour of entity uploaded media so that articles/comments linking...
[mir.git]
/
source
/
default.properties
diff --git
a/source/default.properties
b/source/default.properties
index
932624b
..
9db014a
100755
(executable)
--- a/
source/default.properties
+++ b/
source/default.properties
@@
-2,7
+2,7
@@
# GENERAL SETUP
#
# This is a full list of defaults options. To configure your site
# GENERAL SETUP
#
# This is a full list of defaults options. To configure your site
-# do NOT change this file. You can override all of these values in
+# do NOT change this file. You can override all of these values in
# your etc/config.properties
#
# your etc/config.properties
#
@@
-17,7
+17,6
@@
Mir.Public-email.address=mir-coders@lists.indymedia.org
Mir.Public-email.name=mir-coders mailinglist
Mir.Version=1.1.0rc0
Mir.Public-email.name=mir-coders mailinglist
Mir.Version=1.1.0rc0
-DirectOpenposting=yes
# The name of the abuse config file (relative to the WEB-INF dir)
Abuse.Config=abuse.properties
# The name of the abuse config file (relative to the WEB-INF dir)
Abuse.Config=abuse.properties
@@
-82,11
+81,14
@@
Mir.Localizer.Producer.GeneratorLibrary= default=freemarker(etc/producer/)
Mir.Localizer.Admin.GeneratorLibrary= default=freemarker(templates/admin/),preview=freemarker(etc/producer)
Mir.Localizer.OpenPosting.GeneratorLibrary= default=freemarker(etc/open/)
Mir.Localizer.Admin.GeneratorLibrary= default=freemarker(templates/admin/),preview=freemarker(etc/producer)
Mir.Localizer.OpenPosting.GeneratorLibrary= default=freemarker(etc/open/)
+# Should an XSS preventing interceptor be used by the producer subsystem?
+Mir.Producer.UseInterceptor=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=2
# 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=2
-
+
# Article previews, a comma seperated list of name = generator
Mir.Localizer.Admin.ArticlePreview = \
default = preview::article.template
# Article previews, a comma seperated list of name = generator
Mir.Localizer.Admin.ArticlePreview = \
default = preview::article.template
@@
-188,6
+190,11
@@
Producer.ActionServlet=/servlet/Mir
# will be linked to.
Producer.ImageRoot=/img
# will be linked to.
Producer.ImageRoot=/img
+# 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=
# the url of the video-server
Producer.Video.Host=http://indy.code-fu.de/video
# the url of the video-server
Producer.Video.Host=http://indy.code-fu.de/video
@@
-389,7
+396,7
@@
Mir.DefaultDateTimeFormat = yyyy-MM-dd HH:mm
Localizer.OpenSession.PersistentUploadedFiles = 0
# Should support for ftp-like uploads (uploads done
Localizer.OpenSession.PersistentUploadedFiles = 0
# Should support for ftp-like uploads (uploads done
-# outside of mir, but included into postings) be
+# outside of mir, but included into postings) be
# supported at all?
Localizer.OpenSession.AllowFTPUploads = 0
# supported at all?
Localizer.OpenSession.AllowFTPUploads = 0