From fe0f47689f32c4752f9f1c328ec64ea6a3d891bf Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Tue, 7 Oct 2014 15:21:42 +0000
Subject: [PATCH] conserver tweaks: - setup break sequence for ipmitool in
 sample config - remind people about log rotation (console logs sometimes get
 quite large)

---
 comms/conserver/Makefile                         |  4 ++--
 .../patches/patch-conserver_cf_conserver_cf      | 16 ++++++++++------
 comms/conserver/pkg/README                       |  5 ++++-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile
index d6439a36183..a0b5d9c60b3 100644
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.48 2014/10/07 14:05:02 sthen Exp $
+# $OpenBSD: Makefile,v 1.49 2014/10/07 15:21:42 sthen Exp $
 
 COMMENT=	manage remote serial consoles via TCP/IP
 
 DISTNAME=	conserver-8.1.20
-REVISION=	1
+REVISION=	2
 CATEGORIES=	comms
 
 MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
diff --git a/comms/conserver/patches/patch-conserver_cf_conserver_cf b/comms/conserver/patches/patch-conserver_cf_conserver_cf
index 5d45a43a57d..54e12be1a93 100644
--- a/comms/conserver/patches/patch-conserver_cf_conserver_cf
+++ b/comms/conserver/patches/patch-conserver_cf_conserver_cf
@@ -1,22 +1,26 @@
-$OpenBSD: patch-conserver_cf_conserver_cf,v 1.2 2014/10/07 14:05:02 sthen Exp $
+$OpenBSD: patch-conserver_cf_conserver_cf,v 1.3 2014/10/07 15:21:42 sthen Exp $
 --- conserver.cf/conserver.cf.orig	Thu Mar 11 16:51:23 2004
-+++ conserver.cf/conserver.cf	Tue Oct  7 15:03:54 2014
-@@ -14,6 +14,14 @@ default cisco	{ type host; portbase 2000; portinc 1; }
++++ conserver.cf/conserver.cf	Tue Oct  7 16:19:32 2014
+@@ -14,9 +14,18 @@ default cisco	{ type host; portbase 2000; portinc 1; }
  default xyplex	{ type host; portbase 2000; portinc 100; }
  default iolan	{ type host; portbase 10000; portinc 1; }
  
 +# example using ipmitool to connect to IPMI serial-over-lan
 +# (conserver also has internal support for freeipmi as a build option)
-+# command is passed to sh; second "exec" avoids keeping that shell around
++# second "exec" avoids keeping the shell around
 +default ipmitool {
-+        type exec; execsubst %=hs;
++        type exec; execsubst %=hs; break 6;
 +        exec exec ipmitool -I lanplus -H % -U ADMIN -P ADMIN sol activate;
 +}
 +
  ### set up some custom break sequences
  break 4 { string "+\d+\d+"; delay 300; }
  break 5 { string "\033c"; }
-@@ -53,6 +61,9 @@ default ts2.conserver.com { include cisco; host ts2.co
++break 6 { string "~B"; }
+ 
+ ### set the defaults for all the consoles
+ # these get applied before anything else
+@@ -53,6 +62,9 @@ default ts2.conserver.com { include cisco; host ts2.co
  
  # and the consoles on ts2.conserver.com
  console ldap1.conserver.com { include ts2.conserver.com; port 7; }
diff --git a/comms/conserver/pkg/README b/comms/conserver/pkg/README
index 4c2d86cec93..d787f8c4574 100644
--- a/comms/conserver/pkg/README
+++ b/comms/conserver/pkg/README
@@ -1,4 +1,4 @@
-$OpenBSD: README,v 1.4 2014/09/08 16:12:11 sthen Exp $
+$OpenBSD: README,v 1.5 2014/10/07 15:21:42 sthen Exp $
 
 +-----------------------------------------------------------------------
 | Running ${FULLPKGNAME} on OpenBSD
@@ -19,4 +19,7 @@ ensure that the _conserver user can write to them, e.g.:
 
   chown _conserver /var/log/conserver /var/log/consoles/*
 
+Note that you will probably also want to arrange rotation of the above
+log files (via newsyslog(8) or another method).
+
 See more information at http://www.conserver.com/