Skip to content

Default HTML test file location updated#462

Merged
JamesH65 merged 1 commit intoraspberrypi:masterfrom
ahogen:patch-1
Mar 6, 2017
Merged

Default HTML test file location updated#462
JamesH65 merged 1 commit intoraspberrypi:masterfrom
ahogen:patch-1

Conversation

@ahogen
Copy link
Copy Markdown
Contributor

@ahogen ahogen commented Nov 28, 2016

When I start with a fresh install of nginx, the test HTML file is in /var/www/html/ instead of the previously mentioned /usr/share/nginx/www. It could be nice to indicate that to viewers even though, like the article mentions, they can check the currently set path themselves in the config file.

When I start with a fresh install of nginx, the test HTML file is in /var/www/html/ instead of the previously mentioned /usr/share/nginx/www
@lurch
Copy link
Copy Markdown
Contributor

lurch commented Nov 28, 2016

Does this mean that #371 is now outdated?

@ahogen
Copy link
Copy Markdown
Contributor Author

ahogen commented Dec 3, 2016

@lurch, I would guess so. Unless I did something wrong during my setup, which could very well be the case since I am brand new to using nginx.

I just wanted to report what my default setup came out looking like, in case it was helpful.

@ahogen ahogen changed the title Default HTMP test file location updated Default HTML test file location updated Dec 3, 2016
@JamesH65
Copy link
Copy Markdown
Contributor

Just checked, oddly that the html files in both those locations are the same on a fresh install, although they have different names. However, the default config file refers to "root /var/www/html" so I would suggest that is the required location for the index,

I'll close the other PR and let this one through.

@AisforAstronaut
Copy link
Copy Markdown
Contributor

AisforAstronaut commented Mar 6, 2017

@JamesH65 File checked and approved. No changes made.

Is this ready to merge, or does the failing check need fixing?

@JamesH65
Copy link
Copy Markdown
Contributor

JamesH65 commented Mar 6, 2017

I'm ignoring the Travis check at the moment, theory being get all the PR's out of the way, then fix the test.

@JamesH65 JamesH65 merged commit f47781d into raspberrypi:master Mar 6, 2017
pull Bot pushed a commit to phiberoptick/documentation that referenced this pull request May 1, 2026
Corrected the package name for reinstalling firmware.

Relates to: raspberrypi#4300

Co-authored-by: framp <framp@linux-tips-and-tricks.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants