From f0bc3fd465d403edc87a44e97a083a591c024343 Mon Sep 17 00:00:00 2001 From: gdm Date: Sat, 6 Aug 2005 22:08:09 +0000 Subject: [PATCH] files modified locally on traven - ?who by? (only committed by gdm from dev server) --- etc/config.properties | 68 +++++++++++++++++++++++------------------ etc/producer/startpage.template | 7 +---- 2 files changed, 39 insertions(+), 36 deletions(-) diff --git a/etc/config.properties b/etc/config.properties index 40857b6..f062985 100755 --- a/etc/config.properties +++ b/etc/config.properties @@ -42,23 +42,26 @@ # mir/project an contact information # for display on the site # -Mir.Name=mir.someserver.org -Mir.Shortname=mir +Mir.Name=publish.nyc.indymedia.org +Mir.Shortname=$NAME -Mir.Contact-email.address=mir-project@somemailserver.org -Mir.Contact-email.name=mir-project mailinglist +Mir.Contact-email.address=webmaster@publish.nyc.indymedia.org +Mir.Contact-email.name=publish.nyc.indymedia.org webmaster -Mir.Tech-email.address=mir-admins@somemailserver.org -Mir.Tech-email.name=mir-admins mailinglist +Mir.Tech-email.address=webmaster@publish.nyc.indymedia.org +Mir.Tech-email.name=publish.nyc.indymedia.org technical contact -Mir.Public-email.address=project@somemailserver.org -Mir.Public-email.name=project mailinglist +Mir.Public-email.address=webmaster@publish.nyc.indymedia.org +Mir.Public-email.name=publish.nyc.indymedia.org public contact # Default timezone to display times in in admin, producers # use CET for Central European Time (Paris, Amsterdam) # more timezones here: http://www.postgresql.org/docs/7.2/static/timezones.html # -Mir.DefaultTimezone= UTC +Mir.DefaultTimezone= America/New_York + +#superuser +AccessControl.SuperUsers = mike, chris, patrick, ana, gdm # Default date/time format # For the syntax of the format, refer to @@ -98,7 +101,7 @@ Mir.Localizer.Admin.AllowDeleteArticle=1 # Which producers need to be called after an article is posted # Mir.Localizer.OpenPosting.ContentProducers= \ -media.new;articles.changed;startpage.generate;synchronization.run +media.new;articles.changed;startpage.generate;opnewswireinclude.generate;synchronization.run # Which producers need to be called after a comment is posted # @@ -110,6 +113,14 @@ articles.changed;synchronization.run Mir.Localizer.Producer.AllNewProducers= \ media.new;articles.changed;startpage.run;synchronization.run + +Mir.Localizer.Admin.TopicLists = content.topic.content:2:0:archiv_url='Content':title, \ + content.topic.location:2:0:archiv_url='Location':title, \ + content.topic.category:1:3:archiv_url='Category':title, \ + content.topic.subcategory:0:10:archiv_url='Subcategory':title + + + ######### # rsync # ######### @@ -117,7 +128,7 @@ media.new;articles.changed;startpage.run;synchronization.run #use rsync to mirror the website to a remote-host # Rsync=no -Rsync.Script.Path=/var/lib/mir/nyc/mir/scripts +Rsync.Script.Path=/var/www/bin/rsync-copy.sh ################### @@ -132,11 +143,8 @@ Rsync.Script.Path=/var/lib/mir/nyc/mir/scripts # :::<0|1 (recursion off or on)> [, ....] # ServletModule.FileEdit.Configuration= \ - includes:/var/lib/mir/nyc/public_html/includes:.*\\.inc:1, \ - prodtemp:/var/lib/mir/nyc/mir/etc/producer:.*\\.template:0, \ - opentemp:/var/lib/mir/nyc/mir/etc/open:.*\\.template:0, \ - bundles:/var/lib/mir/nyc/mir/etc/bundles:.*\\.properties:0 - + includes:/imc/mir/nyc/css/:.*:1 + ################################################ ########### B) STATIC SITE CONFIG ############# ################################################ @@ -144,7 +152,7 @@ ServletModule.FileEdit.Configuration= \ # the url of the static site # on the machine where mir runs on # -Producer.ProductionHost=http://nyc.indymedia.org +Producer.ProductionHost=http://publish.nyc.indymedia.org # the url of the public site # only different from ProductionHost if pages are copied to @@ -155,7 +163,7 @@ Producer.PublicationHost=http://nyc.indymedia.org # Produrce.StorageRoot is the directory, in which # the generated HTML pages will be stored # -Producer.StorageRoot=/var/lib/mir/nyc/public_html +Producer.StorageRoot=/imc/mir/nyc # use this property only if the pages are NOT produced under the docRoot # of the webserver. all links in the produced pages are prepended @@ -174,23 +182,23 @@ Producer.DocRoot= # the url of the video-server # -Producer.Video.Host=http://nyc.indymedia.org/video +Producer.Video.Host=/video # the url of the audio-server # -Producer.Audio.Host=http://nyc.indymedia.org/audio +Producer.Audio.Host=/audio # the url of the image-server # -Producer.Image.Host=http://nyc.indymedia.org/images +Producer.Image.Host=/images # the url of the media-server # -Producer.Media.Host=http://nyc.indymedia.org/media +Producer.Media.Host=/media # the url of the real-media-server # -Producer.RealMedia.Host=rtsp://some.streamingmedia.server/somedir/ +Producer.RealMedia.Host=rtsp://nyc.indymedia.org/real/ @@ -200,18 +208,18 @@ Producer.RealMedia.Host=rtsp://some.streamingmedia.server/somedir/ # absolute directory, where the images are saved # -Producer.Image.Path=/var/lib/mir/nyc/public_html/images +Producer.Image.Path=/imc/mir/nyc/images/ # absolute directory, where the media files are saved # -Producer.Media.Path=/var/lib/mir/nyc/public_html/media +Producer.Media.Path=/imc/mir/nyc/media # absolute directory, where the realmedia data files(ra and rm) are saved # the ram files which point to the RealMedia.Host get saved in the regular Media dir # this should make rsyncing to a separate streaming server much easier # -Producer.RealMedia.Path=/var/lib/nyc/public_html/rtsp +Producer.RealMedia.Path=/imc/mir/nyc/rtsp # mir creates a small thumbnail-icon for each image posted # relativ directory, where the thumbnails will be saved @@ -266,7 +274,7 @@ Producer.ActionServlet=/servlet/Mir # the url of the openposting-servlet # -Producer.OpenAction=https://publish.indymedia.org/nyc/servlet/OpenMir +Producer.OpenAction=https://publish.nyc.indymedia.org/nyc/servlet/OpenMir # the maximum allowed size of an uploaded media file in KB. # @@ -296,7 +304,7 @@ ServletModule.OpenIndy.DefaultMediaUploadItems=1 # a single line of big text which will appear at the top of the first page of all generated pdfs # -PDF.Title=NYC INDYMEDIA +PDF.Title=publish.nyc.indymedia.org # about two lines of small text which will appear at the bottom of every page # @@ -313,9 +321,9 @@ PDF.PageSize=A4 # specify your database # -Database.Name=nyc +Database.Name=nyc2 Database.Username=nyc -Database.Password=nyc +Database.Password=1TDH9QDC Database.Host=localhost Database.Port=5432 diff --git a/etc/producer/startpage.template b/etc/producer/startpage.template index 6342cef..7df0888 100755 --- a/etc/producer/startpage.template +++ b/etc/producer/startpage.template @@ -1,9 +1,4 @@ - - Template file for the front page. - - all paths relative to / - - no complicated freemarker code - -- 2.11.0