From 89918d28e5349bd388147c387515194333feb2ef Mon Sep 17 00:00:00 2001 From: mwall Date: Sun, 8 Mar 2020 13:47:41 -0400 Subject: [PATCH 1/3] set logging defaults for netbsd and openbsd --- bin/weeutil/logger.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bin/weeutil/logger.py b/bin/weeutil/logger.py index e5b5bff4..4ced16f8 100644 --- a/bin/weeutil/logger.py +++ b/bin/weeutil/logger.py @@ -26,6 +26,12 @@ elif sys.platform.startswith('linux'): elif sys.platform.startswith('freebsd'): address = '/var/run/log' facility = 'user' +elif sys.platform.startswith('netbsd'): + address = '/var/run/log' + facility = 'user' +elif sys.platform.startswith('openbsd'): + address = '/dev/log' + facility = 'user' else: address = ('localhost', 514) facility = 'user' From 3ec36d68a1b9db8de72e7c7d6e73d6ac32971efc Mon Sep 17 00:00:00 2001 From: mwall Date: Sun, 8 Mar 2020 13:54:12 -0400 Subject: [PATCH 2/3] update changelog regarding logging setup --- docs/changes.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index f09f15a5..88b4f70a 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -127,8 +127,11 @@ consistent with "meter". The spelling "litre" is still accepted. Systemd type changed from "simple" to "forking". Thanks to user Jaap de Munck for figuring this one out! -The configuration file is now an optional argument when running weewxd directly. -This means most users will be able to use the simple command line 'sudo weewxd'. +The configuration file is now an optional argument when running weewxd +directly. This means most users will be able to use the simple command +line 'sudo weewxd'. + +Use correct log path for netbsd and openbsd in logger setup. 3.9.2 07/14/2019 From 816c5f2297c4f3a9e325c2f2ff878f1ffd71ff85 Mon Sep 17 00:00:00 2001 From: yesjpm <59117995+yesjpm@users.noreply.github.com> Date: Sat, 14 Mar 2020 00:20:54 +0100 Subject: [PATCH 3/3] Update weewx.conf (#515) --- util/apache/conf.d/weewx.conf | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/util/apache/conf.d/weewx.conf b/util/apache/conf.d/weewx.conf index 4a8526f6..41c2e76e 100644 --- a/util/apache/conf.d/weewx.conf +++ b/util/apache/conf.d/weewx.conf @@ -2,9 +2,5 @@ Alias /weewx /home/weewx/public_html Options FollowSymlinks AllowOverride None -# for apache 2.2 - Order allow,deny - Allow from all -# for apache 2.4 -# Require all granted + Require all granted