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

Check correct path for config in the installer #10333

Merged
merged 4 commits into from
Jun 15, 2019
Merged

Check correct path for config in the installer #10333

merged 4 commits into from
Jun 15, 2019

Conversation

janyksteenbeek
Copy link
Contributor

@janyksteenbeek janyksteenbeek commented Jun 11, 2019

For older installations, install.php is still available for installations that have the configuration file in the parent directory. This PR fixes this.

DO NOT DELETE THIS TEXT

Please note

Please read this information carefully. You can run ./scripts/pre-commit.php to check your code before submitting.

Testers

If you would like to test this pull request then please run: ./scripts/github-apply <pr_id>, i.e ./scripts/github-apply 5926
After you are done testing, you can remove the changes with ./scripts/github-remove. If there are schema changes, you can ask on discord how to revert.

For older installations, install.php is still available for installations that have the configuration file in the parent directory. This PR fixes this.
@CLAassistant
Copy link

CLAassistant commented Jun 11, 2019

CLA assistant check
All committers have signed the CLA.

@janyksteenbeek janyksteenbeek changed the title Check ../config.php for older installations in installer Check parent folder for config in installer Jun 11, 2019
@janyksteenbeek
Copy link
Contributor Author

Seems like Travis CI tests are failing because of code that is not relevant to this PR.

@murrant
Copy link
Member

murrant commented Jun 12, 2019

Yeah, upstream issue with Chrome 75. Another PR will fix.

html/install.php Outdated Show resolved Hide resolved
@janyksteenbeek
Copy link
Contributor Author

janyksteenbeek commented Jun 13, 2019

Replaced relative directory with absolute path according to your review

@murrant murrant changed the title Check parent folder for config in installer Check correct path for config in the installer Jun 15, 2019
@murrant murrant merged commit 2ee843d into librenms:master Jun 15, 2019
@lock lock bot locked as resolved and limited conversation to collaborators Aug 14, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants