From owner-svn-ports-head@freebsd.org Thu Jul 30 16:43:39 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3ACD93AA445; Thu, 30 Jul 2020 16:43:39 +0000 (UTC) (envelope-from dvl@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BHbp30nmwz4cLL; Thu, 30 Jul 2020 16:43:39 +0000 (UTC) (envelope-from dvl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D84C4140C1; Thu, 30 Jul 2020 16:43:38 +0000 (UTC) (envelope-from dvl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06UGhcNn036903; Thu, 30 Jul 2020 16:43:38 GMT (envelope-from dvl@FreeBSD.org) Received: (from dvl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06UGhcKc036901; Thu, 30 Jul 2020 16:43:38 GMT (envelope-from dvl@FreeBSD.org) Message-Id: <202007301643.06UGhcKc036901@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dvl set sender to dvl@FreeBSD.org using -f From: Dan Langille Date: Thu, 30 Jul 2020 16:43:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r543804 - in head/net-mgmt/librenms: . files X-SVN-Group: ports-head X-SVN-Commit-Author: dvl X-SVN-Commit-Paths: in head/net-mgmt/librenms: . files X-SVN-Commit-Revision: 543804 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jul 2020 16:43:39 -0000 Author: dvl Date: Thu Jul 30 16:43:38 2020 New Revision: 543804 URL: https://svnweb.freebsd.org/changeset/ports/543804 Log: Add more comments into the config.php.default patches so it is clear to the user which settings are FreeBSD-specfic. Also, set $config['update'] = 0; because if you're installing from a package you don't want the software trying to update itself via git, which it will attempt from daily.sh, but will fail because git is [usually] not installed. Modified: head/net-mgmt/librenms/Makefile head/net-mgmt/librenms/files/patch-config.php.default Modified: head/net-mgmt/librenms/Makefile ============================================================================== --- head/net-mgmt/librenms/Makefile Thu Jul 30 16:16:02 2020 (r543803) +++ head/net-mgmt/librenms/Makefile Thu Jul 30 16:43:38 2020 (r543804) @@ -3,7 +3,7 @@ PORTNAME= librenms PORTVERSION= 1.65.1 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= LOCAL/dvl:vendor Modified: head/net-mgmt/librenms/files/patch-config.php.default ============================================================================== --- head/net-mgmt/librenms/files/patch-config.php.default Thu Jul 30 16:16:02 2020 (r543803) +++ head/net-mgmt/librenms/files/patch-config.php.default Thu Jul 30 16:43:38 2020 (r543804) @@ -1,22 +1,45 @@ --- config.php.default.orig 2020-07-10 19:56:16 UTC +++ config.php.default -@@ -2,9 +2,14 @@ +@@ -2,10 +2,26 @@ ## Have a look in misc/config_definitions.json for examples of settings you can set here. DO NOT EDIT misc/config_definitions.json! ++# ++# The FreeBSD package set the following items ++# +$config['installed_from_package'] = true; + +$config['log_dir'] = '/var/log/librenms'; +$config['rrd_dir'] = '/var/db/librenms/rrd'; + // This is the user LibreNMS will run as - //Please ensure this user is created and has the correct permissions to your install +-//Please ensure this user is created and has the correct permissions to your install -$config['user'] = 'librenms'; ++// Please ensure this user is created and has the correct permissions to your install ++// The FreeBSD package sets this. ++// It's up to you to install a webserver, such as Apache or Nginx. By default, they ++// run as the www user. ++// +$config['user'] = 'www'; ++# ++# The FreeBSD package set the above items ++# ++ ### This should *only* be set if you want to *force* a particular hostname/port ### It will prevent the web interface being usable form any other hostname -@@ -43,3 +48,22 @@ $config['enable_billing'] = 1; + #$config['base_url'] = "/"; +@@ -27,7 +43,8 @@ $config['auth_mechanism'] = "mysql"; # default, other + #$config['nets'][] = "192.168.0.0/16"; + + # Uncomment the next line to disable daily updates +-#$config['update'] = 0; ++# FreeBSD package uncommented this line for you. ++$config['update'] = 0; + + # Number in days of how long to keep old rrd files. 0 disables this feature + $config['rrd_purge'] = 0; +@@ -43,3 +60,22 @@ $config['enable_billing'] = 1; # Enable the in-built services support (Nagios plugins) $config['show_services'] = 1;