diff --git a/data/sphinx.conf b/contrib/sphinx.conf
similarity index 100%
rename from data/sphinx.conf
rename to contrib/sphinx.conf
diff --git a/data/.htaccess b/data/.htaccess
deleted file mode 100644
index 682cc4da8..000000000
--- a/data/.htaccess
+++ /dev/null
@@ -1,7 +0,0 @@
-# Nothing in this directory is retrievable unless overridden by an .htaccess
-# in a subdirectory; the only exception is duplicates.rdf, which is used by
-# duplicates.xul and must be accessible from the web server
-deny from all
-
- allow from all
-
diff --git a/data/hgsvn-filemap b/data/hgsvn-filemap
deleted file mode 100644
index a2af88901..000000000
--- a/data/hgsvn-filemap
+++ /dev/null
@@ -1,5 +0,0 @@
-1
-include .
-exclude data/params.bugs3
-exclude data/params.bugs3-sm
-exclude data/hgsvn-filemap
diff --git a/data/params.bugs3 b/data/params.bugs3
deleted file mode 100644
index 9be9ea127..000000000
--- a/data/params.bugs3
+++ /dev/null
@@ -1,171 +0,0 @@
-%param = (
- 'LDAPBaseDN' => '',
- 'LDAPbinddn' => '',
- 'LDAPfilter' => '',
- 'LDAPmailattribute' => 'mail',
- 'LDAPserver' => '',
- 'LDAPstarttls' => 0,
- 'LDAPuidattribute' => 'uid',
- 'RADIUS_NAS_IP' => '',
- 'RADIUS_email_suffix' => '',
- 'RADIUS_secret' => '',
- 'RADIUS_server' => '',
- 'allow-test-deletion' => '1',
- 'allow_attach_url' => 0,
- 'allow_attachment_deletion' => 0,
- 'allow_attachment_display' => '1',
- 'allowbugdeletion' => 0,
- 'allowemailchange' => 0,
- 'allowuserdeletion' => 0,
- 'announcehtml' => '',
- 'attachment_base' => '',
- 'auth_env_email' => 'REMOTE_USER',
- 'auth_env_id' => '',
- 'auth_env_realname' => '',
- 'auto_add_flag_requestees_to_cc' => '1',
- 'bonsai_url' => '',
- 'bug-to-test-case-action' => 'Verify that bug %id% is fixed: %description%',
- 'bug-to-test-case-results' => '',
- 'bug-to-test-case-summary' => 'Test for bug %id% - %summary%',
- 'chartgroup' => 'editbugs',
- 'clear_requests_on_close' => '1',
- 'commentonchange_resolution' => 0,
- 'commentonduplicate' => 0,
- 'confirmuniqueusermatch' => 1,
- 'cookiedomain' => 'bugs.office.custis.ru',
- 'cookiepath' => '/bugs',
- 'createemailregexp' => '.*',
- 'cvsroot' => '',
- 'cvsroot_get' => '',
- 'default-test-case-status' => 'CONFIRMED',
- 'defaultopsys' => 'All',
- 'defaultplatform' => 'All',
- 'defaultpriority' => 'P3',
- 'defaultquery' => 'bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailqa_contact2=1&order=Importance&long_desc_type=substring',
- 'defaultseverity' => 'normal',
- 'docs_urlbase' => 'docs/%lang%/html/',
- 'duplicate_or_move_bug_status' => 'RESOLVED',
- 'emailin_autoregister' => 1,
- 'emailregexp' => '^[\\w\\.\\+\\-=]+@[\\w\\.\\-]+\\.[\\w\\-]+$',
- 'emailregexpdesc' => 'A legal address must contain exactly one \'@\', and at least one \'.\' after the @.',
- 'emailsuffix' => '',
- 'error_log' => 'errorlog',
- 'ext_disable_refresh_views' => 0,
- 'fof_sudo_mynetworks' => '127.0.0.1/32,172.29.0.6/32',
- 'fof_sudo_server' => 'http://feeds.office.custis.ru/fof-sudo.php',
- 'force_attach_bigfile' => 1,
- 'globalwatchers' => '',
- 'graph_font' => '/usr/share/fonts/truetype/windows/seguibk.ttf',
- 'graph_font_size' => '9',
- 'graph_rankdir' => 'LR',
- 'inbound_proxies' => '',
- 'inline_attachment_mime' => '^text/|^image/',
- 'insidergroup' => 'InsiderGroup',
- 'letsubmitterchoosemilestone' => 1,
- 'letsubmitterchoosepriority' => 1,
- 'levenshteinusermatch' => '0.4',
- 'localdottimeout' => '10',
- 'login_lockout_interval' => '5',
- 'login_urlbase_redirects' => '[^\\@]+\\@custis\\.ru$ http://bugs.office.custis.ru/bugs/
-[^\\@]+\\@(sportmaster\\.ru|ilion\\.ru|sportmaster\\.com\\.ua|scn\\.ru|mbr\\.ru|ilion\\.ru|vek\\.ru|bis\\.overta\\.ru) http://penguin.office.custis.ru/bugzilla/',
- 'lxr_root' => '',
- 'lxr_url' => '',
- 'mail_delivery_method' => 'Sendmail',
- 'mailfrom' => 'bugzilla-daemon@custis.ru',
- 'maintainer' => 'vfilippov@custis.ru',
- 'makeproductgroups' => '0',
- 'max_login_attempts' => '50',
- 'maxattachmentsize' => '5000',
- 'maxlocalattachment' => '1000',
- 'maxusermatches' => '1000',
- 'mediawiki_urls' => 'wiki http://wiki.office.custis.ru/wiki/index.php/
-smwiki http://penguin.office.custis.ru/smwiki/index.php/
-sbwiki http://sobin.office.custis.ru/sbwiki/index.php/
-rdwiki http://radey.office.custis.ru/rdwiki/index.php/
-gzwiki http://gazprom.office.custis.ru/gzwiki/index.php/
-gzstable http://gazprom.office.custis.ru/gzstable/index.php/
-dpwiki http://depobraz.office.custis.ru/dpwiki/index.php/
-hrwiki http://hrwiki.office.custis.ru/hrwiki/index.php/
-cbwiki http://cbr.office.custis.ru/cbwiki/index.php/
-orwiki http://lodge.office.custis.ru/orwiki/index.php/
-rawiki http://rawiki.office.custis.ru/rawiki/index.php/
-crmwiki http://crm.office.custis.ru/
-itwiki http://itwiki.office.custis.ru/itwiki/index.php/',
- 'mime_types_file' => '/etc/mime.types',
- 'mostfreqthreshold' => '2',
- 'move-button-text' => 'Move To Bugscape',
- 'move-enabled' => '1',
- 'move-to-address' => 'bugzilla-import',
- 'move-to-url' => '',
- 'moved-default-component' => 'dev',
- 'moved-default-product' => 'Bugzilla',
- 'moved-from-address' => 'bugzilla-admin',
- 'movers' => '',
- 'musthavemilestoneonaccept' => 0,
- 'mybugstemplate' => 'buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&email1=%userid%&emailtype1=exact&emailassigned_to1=1&emailreporter1=1',
- 'new-case-action-template' => '',
- 'new-case-results-template' => '',
- 'noresolveonopenblockers' => '0',
- 'proxy_url' => 'http://proxy.custis.ru:3128/',
- 'querysharegroup' => 'editbugs',
- 'quip_list_entry_control' => 'open',
- 'rememberlogin' => 'on',
- 'report_code_errors_to_maintainer' => '1',
- 'report_user_errors_to_maintainer' => '0',
- 'requirelogin' => '1',
- 'sendmailnow' => 1,
- 'shadowdb' => '',
- 'shadowdbhost' => '',
- 'shadowdbport' => '3306',
- 'shadowdbsock' => '',
- 'shutdownhtml' => '',
- 'sm_dotproject_login' => 'ws-zis',
- 'sm_dotproject_password' => '',
- 'sm_dotproject_ws_user' => 'ws-sur@sportmaster.ru',
- 'sm_dotproject_wsdl_url' => 'http://sur.moscow.sportmaster.ru/dotproject/services/index.php?wsdl',
- 'smtp_debug' => 0,
- 'smtp_password' => '',
- 'smtp_username' => '',
- 'smtpserver' => 'localhost',
- 'specific_search_allow_empty_words' => '1',
- 'ssl_redirect' => 0,
- 'sslbase' => '',
- 'stem_language' => 'ru',
- 'strict_isolation' => 0,
- 'supa_jar_url' => '',
- 'test_case_wiki_action_iframe' => '',
- 'testopia-allow-group-member-deletes' => 0,
- 'testopia-debug' => 'ON',
- 'testopia-default-plan-testers-regexp' => undef,
- 'testopia-hide-htmleditor' => '1',
- 'testopia-max-allowed-plan-testers' => '500',
- 'testopia-show-setup-breakdown' => 0,
- 'testopia_sync_password' => 'tester',
- 'testopia_sync_user' => 'TestBot',
- 'timetrackinggroup' => "\x{432}\x{435}\x{441}\x{44c} \x{417}\x{418}\x{421}",
- 'unauth_bug_details' => '1',
- 'upgrade_notification' => 'latest_stable_release',
- 'urlbase' => 'http://bugs.office.custis.ru/bugs/',
- 'use_mailer_queue' => 0,
- 'use_see_also' => 0,
- 'use_supa_applet' => '1',
- 'usebugaliases' => 1,
- 'useclassification' => 1,
- 'usemenuforusers' => '0',
- 'useopsys' => 0,
- 'useplatform' => 0,
- 'useqacontact' => 1,
- 'user_info_class' => 'FOF_Sudo,Env,CGI',
- 'user_mailto' => 'http://plantime.office.custis.ru/CurrentPresence.aspx?search=',
- 'user_verify_class' => 'DB',
- 'usestatuswhiteboard' => 1,
- 'usetargetmilestone' => 1,
- 'usevisibilitygroups' => 0,
- 'usevotes' => 0,
- 'utf8' => 1,
- 'viewvc_url' => 'http://viewvc.office.custis.ru/viewvc.py/',
- 'webdotbase' => '/usr/bin/dot',
- 'webtwopibase' => '/usr/bin/twopi',
- 'whinedays' => '30',
- 'wiki_url' => 'http://wiki.office.custis.ru/wiki/index.php/'
- );
diff --git a/data/params.bugs3-sm b/data/params.bugs3-sm
deleted file mode 100644
index 67ccf5cf7..000000000
--- a/data/params.bugs3-sm
+++ /dev/null
@@ -1,171 +0,0 @@
-%param = (
- 'LDAPBaseDN' => '',
- 'LDAPbinddn' => '',
- 'LDAPfilter' => '',
- 'LDAPmailattribute' => 'mail',
- 'LDAPserver' => '',
- 'LDAPstarttls' => 0,
- 'LDAPuidattribute' => 'uid',
- 'RADIUS_NAS_IP' => '',
- 'RADIUS_email_suffix' => '',
- 'RADIUS_secret' => '',
- 'RADIUS_server' => '',
- 'allow-test-deletion' => '1',
- 'allow_attach_url' => 0,
- 'allow_attachment_deletion' => 0,
- 'allow_attachment_display' => '1',
- 'allowbugdeletion' => 0,
- 'allowemailchange' => 0,
- 'allowuserdeletion' => 0,
- 'announcehtml' => '',
- 'attachment_base' => '',
- 'auth_env_email' => 'REMOTE_USER',
- 'auth_env_id' => '',
- 'auth_env_realname' => '',
- 'auto_add_flag_requestees_to_cc' => '1',
- 'bonsai_url' => '',
- 'bug-to-test-case-action' => 'Verify that bug %id% is fixed: %description%',
- 'bug-to-test-case-results' => '',
- 'bug-to-test-case-summary' => 'Test for bug %id% - %summary%',
- 'chartgroup' => 'editbugs',
- 'clear_requests_on_close' => '1',
- 'commentonchange_resolution' => 0,
- 'commentonduplicate' => 0,
- 'confirmuniqueusermatch' => 1,
- 'cookiedomain' => '',
- 'cookiepath' => '/bugzilla',
- 'createemailregexp' => '.*',
- 'cvsroot' => '',
- 'cvsroot_get' => '',
- 'default-test-case-status' => 'CONFIRMED',
- 'defaultopsys' => 'All',
- 'defaultplatform' => 'All',
- 'defaultpriority' => 'P3',
- 'defaultquery' => 'bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailqa_contact2=1&order=Importance&long_desc_type=substring',
- 'defaultseverity' => 'normal',
- 'docs_urlbase' => 'docs/%lang%/html/',
- 'duplicate_or_move_bug_status' => 'RESOLVED',
- 'emailin_autoregister' => 1,
- 'emailregexp' => '^[\\w\\.\\+\\-=]+@[\\w\\.\\-]+\\.[\\w\\-]+$',
- 'emailregexpdesc' => 'A legal address must contain exactly one \'@\', and at least one \'.\' after the @.',
- 'emailsuffix' => '',
- 'error_log' => 'errorlog',
- 'ext_disable_refresh_views' => 1,
- 'fof_sudo_mynetworks' => '127.0.0.1/32,172.29.0.6/32',
- 'fof_sudo_server' => 'http://feeds.office.custis.ru/fof-sudo.php',
- 'force_attach_bigfile' => 1,
- 'globalwatchers' => '',
- 'graph_font' => '/usr/share/fonts/truetype/windows/seguibk.ttf',
- 'graph_font_size' => '9',
- 'graph_rankdir' => 'LR',
- 'inbound_proxies' => '',
- 'inline_attachment_mime' => '^text/|^image/',
- 'insidergroup' => 'admin',
- 'letsubmitterchoosemilestone' => 1,
- 'letsubmitterchoosepriority' => 1,
- 'levenshteinusermatch' => '0.4',
- 'localdottimeout' => 5,
- 'login_lockout_interval' => '5',
- 'login_urlbase_redirects' => '[^\\@]+\\@custis\\.ru$ http://bugs.office.custis.ru/bugs/
-[^\\@]+\\@(sportmaster\\.ru|ilion\\.ru|sportmaster\\.com\\.ua|scn\\.ru|mbr\\.ru|ilion\\.ru|vek\\.ru|bis\\.overta\\.ru) http://penguin.office.custis.ru/bugzilla/',
- 'lxr_root' => '',
- 'lxr_url' => '',
- 'mail_delivery_method' => 'Sendmail',
- 'mailfrom' => 'bugzilla-daemon@custis.ru',
- 'maintainer' => 'vfilippov@custis.ru',
- 'makeproductgroups' => '1',
- 'max_login_attempts' => '50',
- 'maxattachmentsize' => '5000',
- 'maxlocalattachment' => '1000',
- 'maxusermatches' => '1000',
- 'mediawiki_urls' => 'wiki http://wiki.office.custis.ru/wiki/index.php/
-smwiki http://penguin.office.custis.ru/smwiki/index.php/
-sbwiki http://sobin.office.custis.ru/sbwiki/index.php/
-rdwiki http://radey.office.custis.ru/rdwiki/index.php/
-gzwiki http://gazprom.office.custis.ru/gzwiki/index.php/
-gzstable http://gazprom.office.custis.ru/gzstable/index.php/
-dpwiki http://depobraz.office.custis.ru/dpwiki/index.php/
-hrwiki http://hrwiki.office.custis.ru/hrwiki/index.php/
-cbwiki http://cbr.office.custis.ru/cbwiki/index.php/
-orwiki http://lodge.office.custis.ru/orwiki/index.php/
-rawiki http://rawiki.office.custis.ru/rawiki/index.php/
-crmwiki http://crm.office.custis.ru/
-itwiki http://itwiki.office.custis.ru/itwiki/index.php/',
- 'mime_types_file' => '/etc/mime.types',
- 'mostfreqthreshold' => '2',
- 'move-button-text' => 'Move To Bugscape',
- 'move-enabled' => '1',
- 'move-to-address' => 'bugzilla-import',
- 'move-to-url' => '',
- 'moved-default-component' => 'dev',
- 'moved-default-product' => 'Bugzilla',
- 'moved-from-address' => 'bugzilla-admin',
- 'movers' => '',
- 'musthavemilestoneonaccept' => 0,
- 'mybugstemplate' => 'buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&email1=%userid%&emailtype1=exact&emailassigned_to1=1&emailreporter1=1',
- 'new-case-action-template' => '',
- 'new-case-results-template' => '',
- 'noresolveonopenblockers' => '0',
- 'proxy_url' => 'http://proxy.custis.ru:3128/',
- 'querysharegroup' => 'editbugs',
- 'quip_list_entry_control' => 'open',
- 'rememberlogin' => 'on',
- 'report_code_errors_to_maintainer' => '1',
- 'report_user_errors_to_maintainer' => '0',
- 'requirelogin' => '1',
- 'sendmailnow' => 1,
- 'shadowdb' => '',
- 'shadowdbhost' => '',
- 'shadowdbport' => '3306',
- 'shadowdbsock' => '',
- 'shutdownhtml' => '',
- 'sm_dotproject_login' => 'ws-zis',
- 'sm_dotproject_password' => '',
- 'sm_dotproject_ws_user' => 'ws-sur@sportmaster.ru',
- 'sm_dotproject_wsdl_url' => 'http://sur.moscow.sportmaster.ru/dotproject/services/index.php?wsdl',
- 'smtp_debug' => 0,
- 'smtp_password' => '',
- 'smtp_username' => '',
- 'smtpserver' => 'localhost',
- 'specific_search_allow_empty_words' => '1',
- 'ssl_redirect' => 0,
- 'sslbase' => '',
- 'stem_language' => 'ru',
- 'strict_isolation' => 0,
- 'supa_jar_url' => '',
- 'test_case_wiki_action_iframe' => '',
- 'testopia-allow-group-member-deletes' => 0,
- 'testopia-debug' => 'OFF',
- 'testopia-default-plan-testers-regexp' => undef,
- 'testopia-hide-htmleditor' => '1',
- 'testopia-max-allowed-plan-testers' => '500',
- 'testopia-show-setup-breakdown' => '0',
- 'testopia_sync_password' => 'tester',
- 'testopia_sync_user' => 'TestBot',
- 'timetrackinggroup' => "\x{432}\x{435}\x{441}\x{44c} \x{417}\x{418}\x{421}",
- 'unauth_bug_details' => 0,
- 'upgrade_notification' => 'latest_stable_release',
- 'urlbase' => 'http://penguin.office.custis.ru/bugzilla/',
- 'use_mailer_queue' => 0,
- 'use_see_also' => '0',
- 'use_supa_applet' => '1',
- 'usebugaliases' => '1',
- 'useclassification' => 0,
- 'usemenuforusers' => '0',
- 'useopsys' => '0',
- 'useplatform' => '0',
- 'useqacontact' => '1',
- 'user_info_class' => 'Env,CGI',
- 'user_mailto' => 'http://plantime.office.custis.ru/CurrentPresence.aspx?search=',
- 'user_verify_class' => 'DB',
- 'usestatuswhiteboard' => '1',
- 'usetargetmilestone' => '1',
- 'usevisibilitygroups' => 0,
- 'usevotes' => 0,
- 'utf8' => 1,
- 'viewvc_url' => 'http://viewvc.office.custis.ru/viewvc.py/',
- 'webdotbase' => '/usr/bin/dot',
- 'webtwopibase' => '/usr/bin/twopi',
- 'whinedays' => 7,
- 'wiki_url' => 'http://wiki.office.custis.ru/wiki/index.php/'
- );