Subject: Re: CVS commit: pkgsrc/sysutils/apcupsd
To: Manuel Bouyer <bouyer@antioche.eu.org>
From: Bernd Ernesti <netbsd@lists.veego.de>
List: pkgsrc-users
Date: 06/15/2007 22:00:14
--dDRMvlgZJXvWKvBx
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
[moved from pkgsrc-changes to pkgsrc-users@NetBSD.org]
On Fri, Jun 15, 2007 at 09:36:32PM +0200, Manuel Bouyer wrote:
> On Fri, Jun 15, 2007 at 09:24:59PM +0200, Bernd Ernesti wrote:
> > Hi,
> >
> > it looks like you still want to use the 'outdated' examples/apcupsd.master.conf
>
> This is what the configure/makefile system wants to use.
Huh?
platforms/etc/Makefile tries to install this version and not the outdated
apcupsd.master.conf file.
> But it's patched so that it acually works.
But as one can see from the head it is based on 3.10.6, but we are now at
3.14.1.
Attached is the diff between the 'patched' apcupsd.master.conf and
the generated platforms/etc/apcupsd.conf.
You will see that the 'patched' file missed some options, e.g. SCRIPTDIR
PWRFAILDIR, NOLOGINDIR, ONBATTERYDELAY
> > file instead of platforms/etc/apcupsd.conf and you didn't patch the rc.d
> > script.
>
> No. I'm not sure it's a good idea to make it rc.d-specific, and certainly
> a very bad one to add the SHUTDOWN keyword.
But adding the needed keywords made it work with rc.d and it doesn't break
anything else (if you leave the SHUTDOWN keyword out).
> > I mentioned both problems in the gants entry for pkg/35594 and pkg/36192.
> > The shutdown keyword may be removed, but the apcupsd.conf is a greater
> > problem which had no reaction from your side.
>
> The apcupsd.master.conf file which is installed actually works.
This was not the case before, because the usb support was missing, which was
not missing from platforms/etc/apcupsd.conf.
Bernd
--dDRMvlgZJXvWKvBx
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="apcupsd.conf.diff"
--- apcupsd.master.conf 2007-06-15 21:48:48.000000000 +0200
+++ apcupsd-3.14.1/platforms/etc/apcupsd.conf 2007-06-15 21:47:22.000000000 +0200
@@ -1,84 +1,132 @@
## apcupsd.conf v1.1 ##
#
-# for apcupsd release 3.10.6 (10 October 2003) - freebsd
+# for apcupsd release 3.14.1 (04 May 2007) - netbsd
#
# "apcupsd" POSIX config file
+
#
# ========= General configuration parameters ============
#
+
# UPSNAME xxx
# Use this to give your UPS a name in log files and such. This
# is particulary useful if you have multiple UPSes. This does not
-# set the EEPROM.
+# set the EEPROM. It should be 8 characters or less.
#UPSNAME
+
+# UPSCABLE <cable>
+# Defines the type of cable connecting the UPS to your computer.
+#
+# Possible generic choices for <cable> are:
+# simple, smart, ether, usb
+#
+# Or a specific cable model number may be used:
+# 940-0119A, 940-0127A, 940-0128A, 940-0020B,
+# 940-0020C, 940-0023A, 940-0024B, 940-0024C,
+# 940-1524C, 940-0024G, 940-0095A, 940-0095B,
+# 940-0095C, M-04-02-2000
#
-# UPSCABLE [ simple | smart |
-# 940-00(20B,20C,23A,24B,24C,24G,95A,95B,95C) |
-# 940-15(24C) |
-# ether, usb ]
-# defines the type of cable that you have.
UPSCABLE smart
+
+# To get apcupsd to work, in addition to defining the cable
+# above, you must also define a UPSTYPE, which corresponds to
+# the type of UPS you have (see the Description for more details).
+# You must also specify a DEVICE, sometimes referred to as a port.
+# For USB UPSes, please leave the DEVICE directive blank. For
+# other UPS types, you must specify an appropriate port or address.
+#
+# UPSTYPE DEVICE Description
+# apcsmart /dev/tty** Newer serial character device,
+# appropriate for SmartUPS models using
+# a serial cable (not USB).
+#
+# usb <BLANK> Most new UPSes are USB. A blank DEVICE
+# setting enables autodetection, which is
+# the best choice for most installations.
#
-# Old types, still valid, are mapped to the new generic drives
-# automatically
-# UPSTYPE [ backups | sharebasic | netups |
-# backupspro | smartvsups |
-# newbackupspro | backupspropnp |
-# smartups | matrixups | sharesmart ]
-#
-# *** NEW TYPES FOR GENERIC DRIVERS ***
-# UPSTYPE [ dumb | apcsmart | net | usb | snmp | test]
-# defines the type of UPS you have.
-UPSTYPE smartups
-#
-#
-#DEVICE <string> /dev/<serial port>
-# name of your UPS device
-#
-# Here a table of the possible devices related with the UPS drivers.
-#
-# NOTE!!! for USB devices, please use a form indicated below
-# including the [0-15] as written!
-#
-# Driver Device Description
-# dumb /dev/tty** Serial character device
-# apcsmart /dev/tty** Serial character device
-# usb /dev/usb/hid/hiddev[0-15] If you follow our naming scheme
-# usb /dev/usb/hiddev[0-15] On some systems
# net hostname:port Network link to a master apcupsd
-# through NIS
+# through apcupsd's Network Information
+# Server. This is used if you don't have
+# a UPS directly connected to your computer.
+#
# snmp hostname:port:vendor:community
# SNMP Network link to an SNMP-enabled
# UPS device. Vendor is the MIB used by
-# the UPS device: can be "APC" or "RFC"
-# where APC is the powernet MIB and RFC
-# is the IETF's rfc1628 UPS-MIB.
-# Port is usually 161.
-DEVICE /dev/tty01
+# the UPS device: can be "APC", "APC_NOTRAP"
+# or "RFC" where APC is the powernet MIB,
+# "APC_NOTRAP" is powernet with SNMP trap
+# catching disabled, and RFC is the IETF's
+# rfc1628 UPS-MIB. You usually want "APC".
+# Port is usually 161. Community is usually
+# "private".
+#
+# dumb /dev/tty** Old serial character device for use
+# with simple-signaling UPSes.
+#
+# pcnet ipaddr:username:passphrase
+# PowerChute Network Shutdown protocol
+# which can be used as an alternative to SNMP
+# with AP9617 family of smart slot cards.
+# ipaddr is the IP address of the UPS mgmt
+# card. username and passphrase are the
+# credentials for which the card has been
+# configured.
#
-#LOCKFILE <path to lockfile>
-# path for serial port lock file
+UPSTYPE apcsmart
+DEVICE /dev/tty01
+
+
+# LOCKFILE <path to lockfile>
+# Path for device lock file. Not used on Win32.
LOCKFILE /var/spool/lock
-#
-#
-#
-# ======== configuration parameters used during power failures ==========
+
+# SCRIPTDIR <path to script directory>
+# Directory in which apccontrol and event scripts are located.
+SCRIPTDIR /usr/pkg/etc/apcupsd
+
+# PWRFAILDIR <path to powerfail directory>
+# Directory in which to write the powerfail flag file. This file
+# is created when apcupsd initiates a system shutdown and is
+# checked in the OS halt scripts to determine if a killpower
+# (turning off UPS output power) is required.
+PWRFAILDIR /usr/pkg/etc/apcupsd
+
+# NOLOGINDIR <path to nologin directory>
+# Directory in which to write the nologin file. The existence
+# of this flag file tells the OS to disallow new logins.
+NOLOGINDIR /etc
+
+
+#
+# ======== Configuration parameters used during power failures ==========
+#
+
+# The ONBATTERYDELAY is the time in seconds from when a power failure
+# is detected until we react to it with an onbattery event.
+#
+# This means that, apccontrol will be called with the powerout argument
+# immediately when a power failure is detected. However, the
+# onbattery argument is passed to apccontrol only after the
+# ONBATTERYDELAY time. If you don't want to be annoyed by short
+# powerfailures, make sure that apccontrol powerout does nothing
+# i.e. comment out the wall.
+ONBATTERYDELAY 6
+
#
# Note: BATTERYLEVEL, MINUTES, and TIMEOUT work in conjunction, so
# the first that occurs will cause the initation of a shutdown.
#
+
# If during a power failure, the remaining battery percentage
# (as reported by the UPS) is below or equal to BATTERYLEVEL,
# apcupsd will initiate a system shutdown.
BATTERYLEVEL 5
-#
-#
+
# If during a power failure, the remaining runtime in minutes
# (as calculated internally by the UPS) is below or equal to MINUTES,
# apcupsd, will initiate a system shutdown.
MINUTES 3
-#
-#
+
# If during a power failure, the UPS has run on batteries for TIMEOUT
# many seconds or longer, apcupsd will initiate a system shutdown.
# A value of 0 disables this timer.
@@ -92,57 +140,59 @@
# If you have an older dumb UPS, you will want to set this to less than
# the time you know you can run on batteries.
TIMEOUT 0
-#
-#
+
# Time in seconds between annoying users to signoff prior to
# system shutdown. 0 disables.
ANNOY 300
-#
+
# Initial delay after power failure before warning users to get
# off the system.
ANNOYDELAY 60
-#
+
# The condition which determines when users are prevented from
# logging in during a power failure.
# NOLOGON <string> [ disable | timeout | percent | minutes | always ]
NOLOGON disable
-#
-#
-# If killdelay is set, apcupsd will continue running after a
+
+# If KILLDELAY is non-zero, apcupsd will continue running after a
# shutdown has been requested, and after the specified time in
# seconds attempt to kill the power. This is for use on systems
# where apcupsd cannot regain control after a shutdown.
# KILLDELAY <seconds> 0 disables
KILLDELAY 0
+
#
+# ==== Configuration statements for Network Information Server ====
#
-# ==== Configuration statements the network information server =========
-#
+
# NETSERVER [ on | off ] on enables, off disables the network
# information server. If netstatus is on, a network information
# server process will be started for serving the STATUS and
# EVENT data over the network (used by CGI programs).
-NETSERVER off
-#
+NETSERVER on
+
# NISIP <dotted notation ip address>
# IP address on which NIS server will listen for incoming connections.
-# Default value is 0.0.0.0 that means any incoming request will be
-# serviced but if you want it to listen to a single subnet you can
-# set it up to that subnet address, for example 192.168.10.0
-# Additionally you can listen for a single IP like 192.168.10.1
+# This is useful if your server is multi-homed (has more than one
+# network interface and IP address). Default value is 0.0.0.0 which
+# means any incoming request will be serviced. Alternatively, you can
+# configure this setting to any specific IP address of your server and
+# NIS will listen for connections only on that interface. Use the
+# loopback address (127.0.0.1) to accept connections only from the
+# local machine.
NISIP 0.0.0.0
-#
+
# NISPORT <port> default is 3551 as registered with the IANA
# port to use for sending STATUS and EVENTS data over the network.
# It is not used unless NETSERVER is on. If you change this port,
# you will need to change the corresponding value in the cgi directory
# and rebuild the cgi programs.
NISPORT 3551
-#
+
# If you want the last few EVENTS to be available over the network
# by the network information server, you must define an EVENTSFILE.
-EVENTSFILE /var/log/apcupsd.events
-#
+EVENTSFILE /var/db/apcupsd.events/apcupsd.events
+
# EVENTSFILEMAX <kilobytes>
# By default, the size of the EVENTSFILE will be not be allowed to exceed
# 10 kilobytes. When the file grows beyond this limit, older EVENTS will
@@ -150,79 +200,83 @@
# parameter EVENTSFILEMAX can be set to a different kilobyte value, or set
# to zero to allow the EVENTSFILE to grow without limit.
EVENTSFILEMAX 10
+
#
# ========== Configuration statements used if sharing =============
-# a UPS and controlling it via the network
-#
-# The configuration statements below are used if you
-# want to share one UPS to power multiple machines and have them
-# communicate by the network. Obviously, the master is connected
-# to the UPS via the serial cable, and it communicates to the
-# "slaves" via the network -- i.e. the slaves get their info
-# concerning the UPS via the ethernet.
-#
-# UPSCLASS [ standalone | shareslave | sharemaster | netslave | netmaster ]
-# normally standalone unless you share a UPS with multiple machines.
+# a UPS with more than one machine
+
+# NETTIME <int>
+# Interval (in seconds) at which the NIS client polls the server.
+# Used only when this apcupsd is a network client (UPSTYPE net).
+#NETTIME 60
+
+#
+# Remaining items are for ShareUPS (APC expansion card) ONLY
+#
+
+# UPSCLASS [ standalone | shareslave | sharemaster ]
+# Normally standalone unless you share an UPS using an APC ShareUPS
+# card.
UPSCLASS standalone
-#
-# Unless you want to share the UPS (power multiple machines).
-# this should be disable
-# UPSMODE [ disable | share | net | sharenet ]
+
+# UPSMODE [ disable | share ]
+# Normally disable unless you share an UPS using an APC ShareUPS card.
UPSMODE disable
+
#
# ===== Configuration statements to control apcupsd system logging ========
#
+
# Time interval in seconds between writing the STATUS file; 0 disables
STATTIME 0
-#
+
# Location of STATUS file (written to only if STATTIME is non-zero)
-STATFILE /var/run/apcupsd.status
-#
-#
+STATFILE /var/db/apcupsd.events/apcupsd.status
+
# LOGSTATS [ on | off ] on enables, off disables
# Note! This generates a lot of output, so if
# you turn this on, be sure that the
# file defined in syslog.conf for LOG_NOTICE is a named pipe.
# You probably do not want this on.
LOGSTATS off
-#
-#
+
# Time interval in seconds between writing the DATA records to
# the log file. 0 disables.
DATATIME 0
-#
+
# FACILITY defines the logging facility (class) for logging to syslog.
# If not specified, it defaults to "daemon". This is useful
# if you want to separate the data logged by apcupsd from other
# programs.
#FACILITY DAEMON
-#
-#
-#
+
#
# ========== Configuration statements used in updating the UPS EPROM =========
#
-# UPS name, max 8 characters -- used only during -n or --rename-ups
-UPSNAME LK-SMART
-#
-# Battery date - 8 characters -- used only during -u or --update-battery-date
-BATTDATE 11/20/01
+
#
-# The following items are set during -c or --configure
+# These statements are used only by apctest when choosing "Set EEPROM with conf
+# file values" from the EEPROM menu. THESE STATEMENTS HAVE NO EFFECT ON APCUPSD.
#
+
+# UPS name, max 8 characters
+#UPSNAME UPS_IDEN
+
+# Battery date - 8 characters
+#BATTDATE mm/dd/yy
+
# Sensitivity to line voltage quality (H cause faster transfer to batteries)
# SENSITIVITY H M L (default = H)
#SENSITIVITY H
-#
+
# UPS delay after power return (seconds)
# WAKEUP 000 060 180 300 (default = 0)
-WAKEUP 60
-#
+#WAKEUP 60
+
# UPS Grace period after request to power off (seconds)
# SLEEP 020 180 300 600 (default = 20)
-SLEEP 180
-#
-#
+#SLEEP 180
+
# Low line voltage causing transfer to batteries
# The permitted values depend on your model as defined by last letter
# of FIRMWARE or APCMODEL. Some representative values are:
@@ -230,8 +284,8 @@
# M 177 172 168 182
# A 092 090 088 086
# I 208 204 200 196 (default = 0 => not valid)
-LOTRANSFER 208
-#
+#LOTRANSFER 208
+
# High line voltage causing transfer to batteries
# The permitted values depend on your model as defined by last letter
# of FIRMWARE or APCMODEL. Some representative values are:
@@ -239,21 +293,21 @@
# M 229 234 239 224
# A 108 110 112 114
# I 253 257 261 265 (default = 0 => not valid)
-HITRANSFER 253
-#
-# Battery change needed to restore power
+#HITRANSFER 253
+
+# Battery charge needed to restore power
# RETURNCHARGE 00 15 50 90 (default = 15)
#RETURNCHARGE 15
-#
+
# Alarm delay
# 0 = zero delay after pwr fail, T = power fail + 30 sec, L = low battery, N = never
# BEEPSTATE 0 T L N (default = 0)
-BEEPSTATE 0
-#
+#BEEPSTATE T
+
# Low battery warning delay in minutes
# LOWBATT 02 05 07 10 (default = 02)
#LOWBATT 2
-#
+
# UPS Output voltage when running on batteries
# The permitted values depend on your model as defined by last letter
# of FIRMWARE or APCMODEL. Some representative values are:
@@ -261,10 +315,8 @@
# M 208
# A 100
# I 230 240 220 225 (default = 0 => not valid)
-OUTPUTVOLTS 230
-#
+#OUTPUTVOLTS 230
+
# Self test interval in hours 336=2 weeks, 168=1 week, ON=at power on
# SELFTEST 336 168 ON OFF (default = 336)
-SELFTEST 168
-#
-#
+#SELFTEST 336
--dDRMvlgZJXvWKvBx--