mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Check and report the correct directories (#9310)

Browse Source 
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.

- [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/)

#### 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.
This commit is contained in:
Tony Murray
2018-10-09 12:21:34 +01:00
committed by Neil Lathwood
parent df90881be1
commit 7c45cd5f69
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LibreNMS/Validations/User.php
+8 -6
View File
@@ -63,18 +63,20 @@ class User extends BaseValidation
// Let's test the user configured if we have it
if (Config::has('user')) {
$dir = Config::get('install_dir');
$log_dir = Config::get('log_dir', "$dir/logs");
$rrd_dir = Config::get('rrd_dir', "$dir/rrd");
// generic fix
$fix = "sudo chown -R $lnms_username:$lnms_groupname $dir\n" .
"sudo setfacl -d -m g::rwx $dir/rrd $dir/logs $dir/bootstrap/cache/ $dir/storage/\n" .
"sudo chmod -R ug=rwX $dir/rrd $dir/logs $dir/bootstrap/cache/ $dir/storage/\n";
"sudo setfacl -d -m g::rwx $rrd_dir $log_dir $dir/bootstrap/cache/ $dir/storage/\n" .
"sudo chmod -R ug=rwX $rrd_dir $log_dir $dir/bootstrap/cache/ $dir/storage/\n";
$find_result = rtrim(`find $dir \! -user $lnms_username -o \! -group $lnms_groupname 2> /dev/null`);
if (!empty($find_result)) {
// Ignore files created by the webserver
$ignore_files = array(
"$dir/logs/error_log",
"$dir/logs/access_log",
"$log_dir/error_log",
"$log_dir/access_log",
"$dir/bootstrap/cache/",
"$dir/storage/framework/cache/",
"$dir/storage/framework/sessions/",
@@ -106,8 +108,8 @@ class User extends BaseValidation
// check folder permissions
$folders = [
'rrd' => Config::get('rrd_dir'),
'log' => Config::get('log_dir'),
'rrd' => $rrd_dir,
'log' => $log_dir,
'bootstrap' => "$dir/bootstrap/cache/",
'storage' => "$dir/storage/",
'cache' => "$dir/storage/framework/cache/",