Skip to content

Commit

Permalink
Merge pull request #2863 from laf/docs-log
Browse files Browse the repository at this point in the history
Updated install docs so users do not chown logs directory
  • Loading branch information
SaaldjorMike committed Jan 25, 2016
2 parents 6d02657 + b763066 commit 273ffd0
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 10 deletions.
1 change: 0 additions & 1 deletion doc/Installation/Installation-(Debian-Ubuntu).md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ First, create and chown the `rrd` directory and create the `logs` directory:

mkdir rrd logs
chown -R librenms:librenms /opt/librenms
chown www-data:www-data logs
chmod 775 rrd

> NOTE: If you're not running Ubuntu or Debian, you will need to change `www-data` to the user and group which run the Apache web server.
Expand Down
6 changes: 0 additions & 6 deletions doc/Installation/Installation-(RHEL-CentOS).md
Original file line number Diff line number Diff line change
Expand Up @@ -265,12 +265,6 @@ First, create and chown the `rrd` directory and create the `logs` directory
mkdir rrd logs
chown -R librenms:librenms /opt/librenms
chmod 775 rrd

# For HTTPd (Apache):
chown apache:apache logs

# For Nginx:
chown nginx:nginx logs
```

> If you're planing on running rrdcached, make sure that the path is also chmod'ed to 775 and chown'ed to librenms:librenms.
Expand Down
1 change: 0 additions & 1 deletion doc/Installation/Installation-Lighttpd-(Debian-Ubuntu).md
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ First, create and chown the `rrd` directory and create the `logs` directory

mkdir rrd logs
chown -R librenms:librenms /opt/librenms
chown www-data:www-data logs
chmod 775 rrd

> NOTE: If you're planing on running rrdcached, make sure that the path is also chmod'ed to 775 and chown'ed to librenms:librenms.
Expand Down
3 changes: 1 addition & 2 deletions validate.php
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@
if (isset($config['user'])) {
$tmp_user = $config['user'];
$tmp_dir = $config['install_dir'];
$tmp_log = $config['log_dir'];
$find_result = rtrim(`find $tmp_dir \! -user $tmp_user -not -path $tmp_log`);
$find_result = rtrim(`find $tmp_dir \! -user $tmp_user`);
if (!empty($find_result)) {
// This isn't just the log directory, let's print the list to the user
$files = explode(PHP_EOL, $find_result);
Expand Down

0 comments on commit 273ffd0

Please sign in to comment.