Changeset 684Tweet

Timestamp:

Sep 12, 2011, 10:56:57 PM (12 years ago)

Author:

root

Message:

web: merge our local configuration changes with trac 0.12's.

Location:

web/trunk/trac

Files:

• conf/trac.ini (modified) (3 diffs)
• conf/trac.ini.sample (modified) (11 diffs)
• htdocs/main.css (modified) (1 diff)

web/trunk/trac/conf/trac.ini

@@ -16 +16 @@
 
 [components]
-wikirename.web_ui.wikirenamemodule = enabled
 tracmenus.* = enabled
 tracmenus.web_ui.* = enabled
+wikirename.web_ui.wikirenamemodule = enabled
 
 [header_logo]
@@ -33 +33 @@
 
 [mainnav]
-browser = disabled
+browser.parent = menu20_devel
 menu10_home = enabled
 menu10_home.href = http://abuse.zoy.org/
@@ -39 +39 @@
 menu10_home.order = 10
 menu10_home.parent = top
-menu20_download = enabled
-menu20_download.href = http://abuse.zoy.org/wiki/download
-menu20_download.label = Download
-menu20_download.order = 20
-menu20_download.parent = top
-menu30_screenshots = enabled
-menu30_screenshots.href = http://abuse.zoy.org/wiki/screenshots
-menu30_screenshots.label = Screenshots
-menu30_screenshots.order = 30
-menu30_screenshots.parent = top
-menu40_devel = enabled
-menu40_devel.href = http://abuse.zoy.org/wiki/dev
-menu40_devel.label = Development
-menu40_devel.order = 40
-menu40_devel.parent = top
-newticket.label = New Bug
-roadmap = disabled
+menu20_10_notes = enabled
+menu20_10_notes.href = http://abuse.zoy.org/wiki/dev
+menu20_10_notes.label = Notes
+menu20_10_notes.order = 10
+menu20_10_notes.parent = menu20_devel
+menu20_devel = enabled
+menu20_devel.href = http://abuse.zoy.org/wiki/dev
+menu20_devel.label = Development

+menu20_devel.order = 20
+menu20_devel.parent = top
+menu30_download = enabled
+menu30_download.href = http://abuse.zoy.org/wiki/download
+menu30_download.label = Download
+menu30_download.order = 30
+menu30_download.parent = top
+menu40_screenshots = enabled
+menu40_screenshots.href = http://abuse.zoy.org/wiki/screenshots
+menu40_screenshots.label = Screenshots
+menu40_screenshots.order = 40
+menu40_screenshots.parent = top
+menu50_bugs = enabled
+menu50_bugs.href = http://abuse.zoy.org/report
+menu50_bugs.label = Bug Reports

+menu50_bugs.order = 50
+menu50_bugs.parent = top
+newticket.label = Report New
+newticket.parent = menu50_bugs
+roadmap.order = 20
+roadmap.parent = menu20_devel
 search = disabled
-tickets.label = Bug Reports
 tickets.href = http://abuse.zoy.org/report/1
-timeline = disabled
+tickets.label = Browse
+tickets.parent = menu50_bugs
+timeline.parent = menu20_devel
 wiki = disabled
 

web/trunk/trac/conf/trac.ini.sample

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
+
+[account-manager]
+account_changes_notify_addresses = 
+# authentication_url = <inherited>
+force_passwd_change = True
+generated_password_length = 8
+hash_method = HtDigestHashMethod
+htdigest_realm = 
+notify_actions = []
+# password_file = <inherited>
+# password_format = <inherited>
+# password_store = <inherited>
+persistent_sessions = False
+reset_password = True
 
 [attachment]
 max_size = 262144
 render_unsafe_content = false
+
+[authz_policy]
+# authz_file = <inherited>
+
+[bitten]
+adjust_timestamps = False
+build_all = False
+chart_style = height: 220px; width: 220px;
+logs_dir = log/bitten
+quick_status = False
+slave_timeout = 3600
+stabilize_wait = 0
 
 [browser]
@@ -22 +48 @@
 wiki_format_messages = true
 
+[git]
+cached_repository = false
+git_bin = /usr/bin/git
+persistent_cache = false
+shortrev_len = 7
+
 [header_logo]
 alt = (please configure the [header_logo] section in trac.ini)
@@ -39 +71 @@
 log_type = none
 
+[menu-custom]
+managed_menus = mainnav,metanav
+serve_ui_files = True
+
 [milestone]
 stats_provider = DefaultTicketGroupStatsProvider
@@ -48 +84 @@
 mime_map = text/x-dylan:dylan,text/x-idl:ice,text/x-ada:ads:adb
 php_path = php
+pygments_default_style = trac
+pygments_modes = 
 silvercity_modes = 
 tab_width = 8
+treat_as_binary = application/octet-stream,application/pdf,application/postscript,application/msword,application/rtf,
 
 [notification]
@@ -56 +95 @@
 always_notify_reporter = false
 always_notify_updater = true
+ambiguous_char_width = single
+email_sender = SmtpEmailSender
 ignore_domains = 
-mime_encoding = base64
+mime_encoding = none
+notify_on_failed_build = true
+notify_on_successful_build = false
+sendmail_path = sendmail
 smtp_always_bcc = 
 smtp_always_cc = 
@@ -77 +121 @@
 [project]
 admin = 
+admin_trac_url = .
 descr = My example project
 footer = Visit the Trac open source project at<br /><a href="http://trac.edgewall.org/">http://trac.edgewall.org/</a>
@@ -87 +132 @@
 default_query = status!=closed&owner=$USER
 items_per_page = 100
+ticketlink_query = ?status=!closed
 
 [report]
@@ -99 +145 @@
 
 [search]
+# default_disabled_filters = <inherited>
 min_query_length = 3
+
+[spam-filter]
+akismet_api_key = 
+akismet_api_url = rest.akismet.com/1.1/
+akismet_karma = 5
+attachment_sample_size = 16384
+bayes_karma = 10
+bayes_min_training = 25
+extlinks_karma = 2
+ip_blacklist_karma = 5
+ip_blacklist_servers = bsb.empty.us, sc.surbl.org
+ip_throttle_karma = 3
+logging_enabled = true
+max_external_links = 4
+max_posts_by_ip = 10
+min_karma = 0
+purge_age = 7
+regex_karma = 5
+session_karma = 9
+trust_authenticated = true
+
+[sqlite]
+# extensions = <inherited>
 
 [svn]
@@ -106 +176 @@
 
 [ticket]
+commit_ticket_update_check_perms = true
+commit_ticket_update_commands.close = close closed closes fix fixed fixes
+commit_ticket_update_commands.refs = addresses re references refs see
+commit_ticket_update_envelope = 
+commit_ticket_update_notify = true
+default_cc = 
 default_component = 
+default_description = 
+default_keywords = 
 default_milestone = 
+default_owner = 
 default_priority = major
 default_resolution = fixed
+default_severity = 
+default_summary = 
 default_type = defect
 default_version = 
+max_comment_size = 262144
 max_description_size = 262144
 preserve_newlines = default
@@ -118 +200 @@
 
 [timeline]
-abbreviated_messages = true
+abbreviated_messages = True
 changeset_collapse_events = false
 changeset_long_messages = false
@@ -128 +210 @@
 
 [trac]
+auth_cookie_lifetime = 0
+auth_cookie_path = 
 authz_file = 
 authz_module_name = 
+auto_preview_timeout = 2.0
 auto_reload = False
+backup_dir = db
 base_url = 
-check_auth_ip = true
+check_auth_ip = false
 database = sqlite:db/trac.db
-default_charset = iso-8859-15
+debug_sql = False
+default_charset = utf-8
 default_handler = WikiModule
+default_language = 
+default_timezone = 
+genshi_cache_size = 128
 htdocs_location = 
 ignore_auth_case = false
 mainnav = wiki,timeline,roadmap,browser,tickets,newticket,search
 metanav = login,logout,prefs,help,about
+mysqldump_path = mysqldump
+never_obfuscate_mailto = false
 permission_policies = DefaultPermissionPolicy, LegacyAttachmentPolicy
 permission_store = DefaultPermissionStore
+pg_dump_path = pg_dump
 repository_dir = 
+repository_sync_per_request = (default)
 repository_type = svn
-request_filters = None
+# request_filters = <inherited>
+resizable_textareas = true
+secure_cookies = False
 show_email_addresses = false
+show_ip_addresses = false
 templates_dir = /usr/share/trac/templates
 timeout = 20
 use_base_url_for_redirect = False
 
+[versioncontrol]
+allowed_repository_dir_prefixes = 
+
 [wiki]
 ignore_missing_pages = false
+max_size = 262144
 render_unsafe_content = false
+safe_schemes = cvs,file,ftp,git,irc,http,https,news,sftp,smb,ssh,svn,svn+ssh
 split_page_names = false
 

web/trunk/trac/htdocs/main.css

@@ -769 +769 @@
 }
 
-.sf-menu li {
-text-align: right;
-}
-