Skip to content

Commit

Permalink
Fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
leslitagordita committed Nov 7, 2018
2 parents 46da398 + 4fddc9c commit 69895d0
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -205,3 +205,9 @@ If you forget your root MySQL password, it can be reset.
You will be asked for the MySQL root user's name and password. The output will show two areas of interest: General recommendations and Variables to adjust.

MySQL Tuner is an excellent starting point to optimize a MySQL server but it would be prudent to perform additional research for configurations tailored to the application(s) utilizing MySQL on your Linode.

{{< community >}}
* [How to install phpMyAdmin on Centos7](https://www.linode.com/community/questions/16988/completing-install-of-phpmyadmin-on-centos-7)
* [How can I setup a LAMP/LEMP stack on my Linode?](https://www.linode.com/community/questions/62/how-can-i-set-up-a-lamplemp-stack-on-my-linode)
* [How do I run both MySQL and MongoDB?](https://www.linode.com/community/questions/425/how-do-i-run-both-mysql-and-mongodb)
{{</ community >}}
Original file line number Diff line number Diff line change
Expand Up @@ -116,3 +116,9 @@ In the following example, `find` locates all files in the hierarchy starting at

find . -name "*.bak" -delete


{{< community >}}
* [Where are My Files?](https://www.linode.com/community/questions/17057/where-are-my-files)
* [How do I check my server's log files?](https://www.linode.com/community/questions/295/how-do-i-check-my-servers-log-files)
* [Can I check my files through the Linode Manager?](https://www.linode.com/community/questions/11220/can-i-check-my-files-through-linode-manager)
{{< /community >}}
Original file line number Diff line number Diff line change
Expand Up @@ -158,3 +158,9 @@ You can remove all access to these files with commands in one of the following f

chmod 600 .msmtprc
chmod g-rwx,o-rwx .fetchmail

{{< community >}}
* [How to set permissions for the webserver directory](https://www.linode.com/community/questions/8808/setting-ownership-and-permissions-for-webserver-directories)
* [Permission issues with Ubuntu](https://www.linode.com/community/questions/6076/permission-issues-with-ubuntu-amp-wordpress-chown-fails)
* [Issues with /var/www permissions](https://www.linode.com/community/questions/7302/varwww-permissions)
{{</ community >}}
7 changes: 7 additions & 0 deletions docs/web-servers/nginx/how-to-configure-nginx/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -280,3 +280,10 @@ Let's analyze what happens during a few requests:
**Request:** `http://example.com/username/roster.pl`

**Returns:** NGINX will use the FastCGI handler to execute the file located at `/srv/www/example.com/public_html/username/roster.pl` and return the result.


{{< community >}}
* [Nginx troubleshooting](https://www.linode.com/community/questions/466/nginx-troubleshooting)
* [Nginx font rules](https://www.linode.com/community/questions/16980/nginx-font-rules)
* [How to set up SSL with NGINX](https://www.linode.com/community/questions/408/set-up-ssl-on-my-nginx-linode)
{{< /community >}}
19 changes: 19 additions & 0 deletions themes/docsmith/static/build/stylesheets/home-27bc036942.min.css

Large diffs are not rendered by default.

0 comments on commit 69895d0

Please sign in to comment.