Skip to content

Commit 7e17acf

Browse files
author
epriestley
committedJan 23, 2013
Remove PhabricatorSetup and make PHABRICATOR_ENV optional
Summary: - PHABRICATOR_ENV is now optional. If you don't specify it, we won't load a config file. - PhabricatorSetup is now gone. - I removed the alternate file domain check for now, see T2380. - `phabricator.setup` config is now gone. - Rewrote documentation: - No more mentions of `phabricator.setup`. - Normal install guide no longer mentions PHABRICATOR_ENV. This is now an advanced topic. - Clarified that you only need to set up one of apache, nginx or lighttpd. - Tweaked a few things I've seen users have difficulty with. This should have no effect on any existing installs, but make the process much simpler for future installs. Closes T2221. Closes T2223. Closes T2228. Test Plan: - Removed my PHABRICATOR_ENV and went through the install process. - Generated and read documentation. Reviewers: btrahan, chad Reviewed By: btrahan CC: aran Maniphest Tasks: T2221, T2223, T2228 Differential Revision: https://secure.phabricator.com/D4596
1 parent d186507 commit 7e17acf

11 files changed

+220
-313
lines changed
 

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@
2323
/conf/custom/*
2424
/conf/local/local.json
2525
/conf/local/ENVIRONMENT
26+
/conf/local/VERSION

‎conf/default.conf.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<?php
22

3+
// IMPORTANT: DO NOT EDIT THIS FILE.
4+
// This file is no longer read by default, and your efforts will have no effect.
5+
// Follow the instructions in the documentation to configure Phabricator.
6+
37
return array(
48

59
// The root URI which Phabricator is installed on.
@@ -11,10 +15,6 @@
1115
// contain the right links.
1216
'phabricator.production-uri' => null,
1317

14-
// Setting this to 'true' will invoke a special setup mode which helps guide
15-
// you through setting up Phabricator.
16-
'phabricator.setup' => false,
17-
1818
// -- IMPORTANT! Security! -------------------------------------------------- //
1919

2020
// IMPORTANT: By default, Phabricator serves files from the same domain the

‎src/__celerity_resource_map__.php

+42-49
Original file line numberDiff line numberDiff line change
@@ -539,13 +539,6 @@
539539
'disk' => '/rsrc/image/texture/table_header_hover.png',
540540
'type' => 'png',
541541
),
542-
'/rsrc/image/texture/table_header_tall.png' =>
543-
array(
544-
'hash' => 'b05525601f78d759f1c5e47fd9c1a8aa',
545-
'uri' => '/res/b0552560/rsrc/image/texture/table_header_tall.png',
546-
'disk' => '/rsrc/image/texture/table_header_tall.png',
547-
'type' => 'png',
548-
),
549542
'/rsrc/swf/aphlict.swf' =>
550543
array(
551544
'hash' => '4b9a9d83bebaf254f3790e87b45c1f92',
@@ -600,7 +593,7 @@
600593
),
601594
'aphront-dialog-view-css' =>
602595
array(
603-
'uri' => '/res/215b3ab1/rsrc/css/aphront/dialog-view.css',
596+
'uri' => '/res/0ec64c77/rsrc/css/aphront/dialog-view.css',
604597
'type' => 'css',
605598
'requires' =>
606599
array(
@@ -609,7 +602,7 @@
609602
),
610603
'aphront-error-view-css' =>
611604
array(
612-
'uri' => '/res/048ed376/rsrc/css/aphront/error-view.css',
605+
'uri' => '/res/410dbe72/rsrc/css/aphront/error-view.css',
613606
'type' => 'css',
614607
'requires' =>
615608
array(
@@ -3254,7 +3247,7 @@
32543247
), array(
32553248
'packages' =>
32563249
array(
3257-
'4dff6da8' =>
3250+
'2b575971' =>
32583251
array(
32593252
'name' => 'core.pkg.css',
32603253
'symbols' =>
@@ -3298,7 +3291,7 @@
32983291
36 => 'phabricator-object-item-list-view-css',
32993292
37 => 'global-drag-and-drop-css',
33003293
),
3301-
'uri' => '/res/pkg/4dff6da8/core.pkg.css',
3294+
'uri' => '/res/pkg/2b575971/core.pkg.css',
33023295
'type' => 'css',
33033296
),
33043297
'c90b892e' =>
@@ -3488,19 +3481,19 @@
34883481
'reverse' =>
34893482
array(
34903483
'aphront-attached-file-view-css' => '83f07678',
3491-
'aphront-crumbs-view-css' => '4dff6da8',
3492-
'aphront-dialog-view-css' => '4dff6da8',
3493-
'aphront-error-view-css' => '4dff6da8',
3494-
'aphront-form-view-css' => '4dff6da8',
3484+
'aphront-crumbs-view-css' => '2b575971',
3485+
'aphront-dialog-view-css' => '2b575971',
3486+
'aphront-error-view-css' => '2b575971',
3487+
'aphront-form-view-css' => '2b575971',
34953488
'aphront-headsup-action-list-view-css' => 'ec01d039',
3496-
'aphront-headsup-view-css' => '4dff6da8',
3497-
'aphront-list-filter-view-css' => '4dff6da8',
3498-
'aphront-pager-view-css' => '4dff6da8',
3499-
'aphront-panel-view-css' => '4dff6da8',
3500-
'aphront-table-view-css' => '4dff6da8',
3501-
'aphront-tokenizer-control-css' => '4dff6da8',
3502-
'aphront-tooltip-css' => '4dff6da8',
3503-
'aphront-typeahead-control-css' => '4dff6da8',
3489+
'aphront-headsup-view-css' => '2b575971',
3490+
'aphront-list-filter-view-css' => '2b575971',
3491+
'aphront-pager-view-css' => '2b575971',
3492+
'aphront-panel-view-css' => '2b575971',
3493+
'aphront-table-view-css' => '2b575971',
3494+
'aphront-tokenizer-control-css' => '2b575971',
3495+
'aphront-tooltip-css' => '2b575971',
3496+
'aphront-typeahead-control-css' => '2b575971',
35043497
'differential-changeset-view-css' => 'ec01d039',
35053498
'differential-core-view-css' => 'ec01d039',
35063499
'differential-inline-comment-editor' => 'ac53d36a',
@@ -3514,7 +3507,7 @@
35143507
'differential-table-of-contents-css' => 'ec01d039',
35153508
'diffusion-commit-view-css' => 'c8ce2d88',
35163509
'diffusion-icons-css' => 'c8ce2d88',
3517-
'global-drag-and-drop-css' => '4dff6da8',
3510+
'global-drag-and-drop-css' => '2b575971',
35183511
'inline-comment-summary-css' => 'ec01d039',
35193512
'javelin-aphlict' => 'c90b892e',
35203513
'javelin-behavior' => 'fbeded59',
@@ -3584,48 +3577,48 @@
35843577
'javelin-util' => 'fbeded59',
35853578
'javelin-vector' => 'fbeded59',
35863579
'javelin-workflow' => 'fbeded59',
3587-
'lightbox-attachment-css' => '4dff6da8',
3580+
'lightbox-attachment-css' => '2b575971',
35883581
'maniphest-task-summary-css' => '83f07678',
35893582
'maniphest-transaction-detail-css' => '83f07678',
35903583
'phabricator-busy' => 'c90b892e',
35913584
'phabricator-content-source-view-css' => 'ec01d039',
3592-
'phabricator-core-buttons-css' => '4dff6da8',
3593-
'phabricator-core-css' => '4dff6da8',
3594-
'phabricator-crumbs-view-css' => '4dff6da8',
3595-
'phabricator-directory-css' => '4dff6da8',
3585+
'phabricator-core-buttons-css' => '2b575971',
3586+
'phabricator-core-css' => '2b575971',
3587+
'phabricator-crumbs-view-css' => '2b575971',
3588+
'phabricator-directory-css' => '2b575971',
35963589
'phabricator-drag-and-drop-file-upload' => 'ac53d36a',
35973590
'phabricator-dropdown-menu' => 'c90b892e',
35983591
'phabricator-file-upload' => 'c90b892e',
3599-
'phabricator-filetree-view-css' => '4dff6da8',
3600-
'phabricator-flag-css' => '4dff6da8',
3601-
'phabricator-form-view-css' => '4dff6da8',
3602-
'phabricator-header-view-css' => '4dff6da8',
3603-
'phabricator-jump-nav' => '4dff6da8',
3592+
'phabricator-filetree-view-css' => '2b575971',
3593+
'phabricator-flag-css' => '2b575971',
3594+
'phabricator-form-view-css' => '2b575971',
3595+
'phabricator-header-view-css' => '2b575971',
3596+
'phabricator-jump-nav' => '2b575971',
36043597
'phabricator-keyboard-shortcut' => 'c90b892e',
36053598
'phabricator-keyboard-shortcut-manager' => 'c90b892e',
3606-
'phabricator-main-menu-view' => '4dff6da8',
3599+
'phabricator-main-menu-view' => '2b575971',
36073600
'phabricator-menu-item' => 'c90b892e',
3608-
'phabricator-nav-view-css' => '4dff6da8',
3601+
'phabricator-nav-view-css' => '2b575971',
36093602
'phabricator-notification' => 'c90b892e',
3610-
'phabricator-notification-css' => '4dff6da8',
3611-
'phabricator-notification-menu-css' => '4dff6da8',
3612-
'phabricator-object-item-list-view-css' => '4dff6da8',
3603+
'phabricator-notification-css' => '2b575971',
3604+
'phabricator-notification-menu-css' => '2b575971',
3605+
'phabricator-object-item-list-view-css' => '2b575971',
36133606
'phabricator-object-selector-css' => 'ec01d039',
36143607
'phabricator-paste-file-upload' => 'c90b892e',
36153608
'phabricator-prefab' => 'c90b892e',
36163609
'phabricator-project-tag-css' => '83f07678',
3617-
'phabricator-remarkup-css' => '4dff6da8',
3610+
'phabricator-remarkup-css' => '2b575971',
36183611
'phabricator-shaped-request' => 'ac53d36a',
3619-
'phabricator-side-menu-view-css' => '4dff6da8',
3620-
'phabricator-standard-page-view' => '4dff6da8',
3612+
'phabricator-side-menu-view-css' => '2b575971',
3613+
'phabricator-standard-page-view' => '2b575971',
36213614
'phabricator-textareautils' => 'c90b892e',
36223615
'phabricator-tooltip' => 'c90b892e',
3623-
'phabricator-transaction-view-css' => '4dff6da8',
3624-
'phabricator-zindex-css' => '4dff6da8',
3625-
'sprite-apps-large-css' => '4dff6da8',
3626-
'sprite-gradient-css' => '4dff6da8',
3627-
'sprite-icon-css' => '4dff6da8',
3628-
'sprite-menu-css' => '4dff6da8',
3629-
'syntax-highlighting-css' => '4dff6da8',
3616+
'phabricator-transaction-view-css' => '2b575971',
3617+
'phabricator-zindex-css' => '2b575971',
3618+
'sprite-apps-large-css' => '2b575971',
3619+
'sprite-gradient-css' => '2b575971',
3620+
'sprite-icon-css' => '2b575971',
3621+
'sprite-menu-css' => '2b575971',
3622+
'syntax-highlighting-css' => '2b575971',
36303623
),
36313624
));

‎src/__phutil_library_map__.php

-1
Original file line numberDiff line numberDiff line change
@@ -1210,7 +1210,6 @@
12101210
'PhabricatorSettingsPanelProfile' => 'applications/settings/panel/PhabricatorSettingsPanelProfile.php',
12111211
'PhabricatorSettingsPanelSSHKeys' => 'applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php',
12121212
'PhabricatorSettingsPanelSearchPreferences' => 'applications/settings/panel/PhabricatorSettingsPanelSearchPreferences.php',
1213-
'PhabricatorSetup' => 'infrastructure/PhabricatorSetup.php',
12141213
'PhabricatorSetupCheck' => 'applications/config/check/PhabricatorSetupCheck.php',
12151214
'PhabricatorSetupCheckAPC' => 'applications/config/check/PhabricatorSetupCheckAPC.php',
12161215
'PhabricatorSetupCheckBaseURI' => 'applications/config/check/PhabricatorSetupCheckBaseURI.php',

‎src/applications/config/option/PhabricatorCoreConfigOptions.php

-3
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,6 @@ public function getOptions() {
125125
$this->newOption('phabricator.env', 'string', null)
126126
->setLocked(true)
127127
->setDescription(pht('Internal.')),
128-
$this->newOption('phabricator.setup', 'bool', false)
129-
->setLocked(true)
130-
->setDescription(pht('Internal / deprecated.')),
131128
$this->newOption('test.value', 'wild', null)
132129
->setLocked(true)
133130
->setDescription(pht('Unit test value.')),

0 commit comments

Comments
 (0)
Failed to load comments.