Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Docs] Specify Apache 2.4 required in README #3976

Merged
merged 7 commits into from
Oct 18, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
LORIS (Longitudinal Online Research and Imaging System) is a web-based data and project management software for neuroimaging research. LORIS makes it easy to manage large datasets including behavioural, clinical, neuroimaging and genetic data acquired over time or at different sites.

<hr>
NEW <b>⇾ Try LORIS on Heroku</b> before installing it on your system<br>
<b>⇾ Try LORIS on Heroku</b> before installing it on your system<br>
Test out the project management and clinical data management side of LORIS (complete Imaging features not yet available)<br>
Deploy and log in with username <i>admin</i> and the password that's set up during deployment via ClearDB.

Expand All @@ -24,15 +24,12 @@ Please consult the [LORIS Wiki Setup Guide](https://github.com/aces/Loris/wiki/S

# Prerequisites for Installation

* LINUX (supported on Ubuntu 14+ and [CentOS 6.5](https://github.com/aces/Loris/blob/master/README.CentOS6.md))
* Apache2
* MySQL 5.7
* PHP <b>7.2</b>
* Package manager (for LINUX distributions)
* Composer : should be run with --no-dev option
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

composer is still required. But maybe the line above it about needing a package manager should be removed while we're at it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed this line because it is basically a duplicate from line 36.

I'll remove the line above.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would make more sense to me to keep it here and delete it below, because installing it is still a prerequisite.

* Apache **2.4** or higher
* MySQL >= 5.7 (or MariaDB >= 10.3)
* PHP <b>7.2</b> or higher
* [Composer](https://getcomposer.org/)

<b>Important:</b>
* If you are upgrading your LORIS, you'll also want to upgrade to both PHP 7.2 and MySQL 5.7.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This still seems worth having.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't think it's redundant given that we have a bulleted list of prereqs above?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True, that makes sense.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But I don't think "Important" is a very good title anymore. "Note" might be more accurate. If you don't specify --no-dev, you just get more dependencies installed.

<b>Note:</b>
* Composer should be run with --no-dev option unless you are an active LORIS developer.

Consult the [LORIS Wiki](https://github.com/aces/Loris/wiki/Setup) page on this [Install process](https://github.com/aces/Loris/wiki/Installing-Loris) for more information.
Expand Down