From 24c14f25259a78e96ea06e49fd7bc30587c867c1 Mon Sep 17 00:00:00 2001 From: laf Date: Mon, 25 Jan 2016 23:14:32 +0000 Subject: [PATCH 1/2] Updated install docs so users do not chown logs directory --- doc/Installation/Installation-(Debian-Ubuntu).md | 1 - doc/Installation/Installation-(RHEL-CentOS).md | 6 ------ doc/Installation/Installation-Lighttpd-(Debian-Ubuntu).md | 1 - 3 files changed, 8 deletions(-) diff --git a/doc/Installation/Installation-(Debian-Ubuntu).md b/doc/Installation/Installation-(Debian-Ubuntu).md index bda460578..e07ac9bd2 100644 --- a/doc/Installation/Installation-(Debian-Ubuntu).md +++ b/doc/Installation/Installation-(Debian-Ubuntu).md @@ -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. diff --git a/doc/Installation/Installation-(RHEL-CentOS).md b/doc/Installation/Installation-(RHEL-CentOS).md index 366bfd61f..b899aa242 100644 --- a/doc/Installation/Installation-(RHEL-CentOS).md +++ b/doc/Installation/Installation-(RHEL-CentOS).md @@ -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. diff --git a/doc/Installation/Installation-Lighttpd-(Debian-Ubuntu).md b/doc/Installation/Installation-Lighttpd-(Debian-Ubuntu).md index b1150b05f..ed4889813 100644 --- a/doc/Installation/Installation-Lighttpd-(Debian-Ubuntu).md +++ b/doc/Installation/Installation-Lighttpd-(Debian-Ubuntu).md @@ -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. From b7630667f482e5e6c681bdcc435c736c9d7a5328 Mon Sep 17 00:00:00 2001 From: laf Date: Mon, 25 Jan 2016 23:17:02 +0000 Subject: [PATCH 2/2] Removed logs folder from being excluded from validate check --- validate.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/validate.php b/validate.php index 6bb3f6047..13db33efd 100755 --- a/validate.php +++ b/validate.php @@ -104,8 +104,7 @@ if (class_exists('Net_IPv6') === false) { 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);