cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.63

Browse Source 
re: https://github.com/librenms/librenms/releases/tag/1.63
This commit is contained in:
Dan Langille 2020-04-30 15:28:48 +00:00
parent abeb02d64e
commit 986e559d2c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=533464
6 changed files with 37 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net-mgmt/librenms/Makefile
View File

@ -2,9 +2,9 @@
# $FreeBSD$
PORTNAME= librenms
PORTVERSION= 1.62.2
PORTVERSION= 1.63
PORTEPOCH= 1
PORTREVISION= 1
PORTREVISION= 0
CATEGORIES= net-mgmt
MASTER_SITES= LOCAL/dvl:vendor
DISTFILES= ${PORTNAME}-vendor-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}${EXTRACT_SUFX}:vendor
@ -19,7 +19,7 @@ USES= python${PY_MYSQL} shebangfix
# RELEASE_TIMESTAMP is used for a patch inside the vendor code
# it represents the release date via: git show --pretty='%H|%ct' -s 1.42.01
# It sits here so you remember to update it with each release
RELEASE_TIMESTAMP= 1586016242
RELEASE_TIMESTAMP= 1588045962
# perhaps we also need python-memcache python-mysqldb
RUN_DEPENDS+= rrdtool:databases/rrdtool \
@ -108,6 +108,7 @@ ROOT_DIRS= LibreNMS app bootstrap config contrib database doc html includes lice
# these are directories which require a generic @DIR entry in pkg-plist
OTHER_DIRS= html/js/lang \
resources/views/overview/custom \
storage/app/public \
storage/debugbar \
storage/framework/cache/data \
@ -124,7 +125,8 @@ OTHER_DIRS= html/js/lang \
vendor/laravel/laravel/storage/framework/sessions \
vendor/laravel/laravel/storage/framework/testing \
vendor/laravel/laravel/storage/framework/views \
vendor/laravel/laravel/storage/logs
vendor/laravel/laravel/storage/logs \
vendor/php-amqplib/php-amqplib/docs
DOCS= AUTHORS.md CHANGELOG.md CONTRIBUTING.md LICENSE.txt README.md
PORTDOCS= *
@ -192,8 +194,6 @@ post-install:
@${ECHO_CMD} "@dir(www,www,0775) ${WWWDIR}/logs" >> ${TMPPLIST}
@${ECHO_CMD} "@dir(www,www,0775) ${WWWDIR}/bootstrap/cache" >> ${TMPPLIST}
# @${ECHO_CMD} "@(www,www,0775) ${WWWDIR}/daily.sh" >> ${TMPPLIST}
# @${ECHO_CMD} "@(www,www,0775) ${WWWDIR}/lnms" >> ${TMPPLIST}
@${ECHO_CMD} "@dir(www,www,0775) ${WWWDIR}/storage" >> ${TMPPLIST}
@${ECHO_CMD} "@dir(www,www,0775) ${WWWDIR}/storage/framework/cache" >> ${TMPPLIST}
@${ECHO_CMD} "@dir(www,www,0775) ${WWWDIR}/storage/framework/sessions" >> ${TMPPLIST}

10
net-mgmt/librenms/distinfo
View File

@ -1,5 +1,5 @@
TIMESTAMP = 1586120645
SHA256 (librenms-vendor-1.62.2.tar.gz) = 1c5f171dc851e946cd92efe65678f878dd9c5fd0d6493d2e55ea37eab71b5b32
SIZE (librenms-vendor-1.62.2.tar.gz) = 64935153
SHA256 (librenms-librenms-1.62.2_GH0.tar.gz) = 40fa9d4f4bf0d2cf43642e879210d2915440b0b09ddf448d014a11876b337e70
SIZE (librenms-librenms-1.62.2_GH0.tar.gz) = 43365349
TIMESTAMP = 1588252287
SHA256 (librenms-vendor-1.63.tar.gz) = 4c6bd2ad777d14752c7fe1ba22bae09079dd5d2f75dcfcfb48d7e42c804521e7
SIZE (librenms-vendor-1.63.tar.gz) = 27496021
SHA256 (librenms-librenms-1.63_GH0.tar.gz) = ac114391958327893013ed8e2e23aeef3f384a398d1fd2347aee91e2689eed43
SIZE (librenms-librenms-1.63_GH0.tar.gz) = 43790047

4
net-mgmt/librenms/files/patch-LibreNMS_Validations_Programs.php
View File

@ -1,6 +1,6 @@
--- LibreNMS/Validations/Programs.php.orig 2018-10-17 10:33:28 UTC
--- LibreNMS/Validations/Programs.php.orig 2020-04-28 03:52:42 UTC
+++ LibreNMS/Validations/Programs.php
@@ -73,6 +73,7 @@ class Programs extends BaseValidation
@@ -74,6 +74,7 @@ class Programs extends BaseValidation
return;
}

14
net-mgmt/librenms/files/patch-LibreNMS_Validations_User.php
View File

@ -1,18 +1,18 @@
--- LibreNMS/Validations/User.php.orig 2018-10-17 10:33:28 UTC
--- LibreNMS/Validations/User.php.orig 2020-04-28 03:52:42 UTC
+++ LibreNMS/Validations/User.php
@@ -71,6 +71,7 @@ class User extends BaseValidation
"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";
@@ -85,6 +85,7 @@ class User extends BaseValidation
"sudo chmod -R ug=rwX $rrd_dir $log_dir $dir/bootstrap/cache/ $dir/storage/",
];
+ if (!Config::get('installed_from_package')) {
$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
@@ -124,6 +125,7 @@ class User extends BaseValidation
@@ -137,6 +138,7 @@ class User extends BaseValidation
$validator->result(ValidationResult::fail(
'Some folders have incorrect file permissions, this may cause issues.'
)->setFix($fix)->setList('Files', explode(PHP_EOL, $incorrect)));
}
+ }
}
} else {
$validator->warn("You don't have \$config['user'] set, this most likely needs to be set to librenms");
}

4
net-mgmt/librenms/files/patch-config.php.default
View File

@ -1,8 +1,8 @@
--- config.php.default.orig 2020-03-02 04:03:32 UTC
--- config.php.default.orig 2020-04-28 03:52:42 UTC
+++ config.php.default
@@ -2,15 +2,20 @@
## Have a look in includes/defaults.inc.php for examples of settings you can set here. DO NOT EDIT defaults.inc.php!
## Have a look in misc/config_definitions.json for examples of settings you can set here. DO NOT EDIT misc/config_definitions.json!
+$config['installed_from_package'] = true;
+

39
net-mgmt/librenms/files/patch-html_install.php
View File

@ -1,15 +1,6 @@
--- html/install.php.orig 2019-05-12 00:03:11 UTC
--- html/install.php.orig 2020-04-30 14:13:30 UTC
+++ html/install.php
@@ -362,7 +362,7 @@ $config_file = <<<"EOD"
// This is the user LibreNMS will run as
//Please ensure this user is created and has the correct permissions to your install
-\$config['user'] = 'librenms';
+\$config['user'] = 'www';
### Locations - it is recommended to keep the default
#\$config\['install_dir'\] = "$install_dir";
@@ -392,14 +392,14 @@
@@ -418,14 +418,14 @@ if ($stage == 0) {
# Update configuration
#\$config\['update_channel'\] = 'release'; # uncomment to follow the monthly release channel
@ -17,21 +8,21 @@
+\$config\['update'\] = 0; # uncomment to completely disable updates
EOD;
if (!file_exists("{$librenms_dir}/config.php")) {
$conf = fopen("config.php", 'w');
if ($conf != false) {
if (fwrite($conf, "<?php\n") === false) {
if (!file_exists("{$librenms_dir}/config.php")) {
$conf = fopen("config.php", 'w');
if ($conf != false) {
if (fwrite($conf, "<?php\n") === false) {
- echo("<div class='alert alert-danger'>We couldn't create the config.php file, please create this manually before continuing by copying the below into a config.php in the root directory of your install (typically /opt/librenms/)</div>");
+ echo("<div class='alert alert-danger'>We couldn't create the config.php file, please create this manually before continuing by copying the below into a config.php in the root directory of your install (typically /usr/local/www/librenms/)</div>");
echo("<pre>&lt;?php\n".stripslashes($config_file)."</pre>");
} else {
$config_file = stripslashes($config_file);
@@ -433,7 +433,7 @@ EOD;
echo("<div class='alert alert-success'>The config file has been created</div>");
}
} else {
- echo("<div class='alert alert-danger'>We couldn't create the config.php file, please create this manually before continuing by copying the below into a config.php in the root directory of your install (typically /opt/librenms/)</div>");
+ echo("<div class='alert alert-danger'>We couldn't create the config.php file, please create this manually before continuing by copying the below into a config.php in the root directory of your install (typically /usr/local/www/librenms/)</div>");
echo("<pre>&lt;?php\n".stripslashes($config_file)."</pre>");
} else {
$config_file = stripslashes($config_file);
@@ -404,7 +404,7 @@ if (!file_exists("config.php")) {
echo("<div class='alert alert-success'>The config file has been created</div>");
}
} else {
- echo("<div class='alert alert-danger'>We couldn't create the config.php file, please create this manually before continuing by copying the below into a config.php in the root directory of your install (typically /opt/librenms/)</div>");
+ echo("<div class='alert alert-danger'>We couldn't create the config.php file, please create this manually before continuing by copying the below into a config.php in the root directory of your install (typically /usr/local/www/librenms/)</div>");
echo("<pre>&lt;?php\n".stripslashes($config_file)."</pre>");
}
}