From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Apr 17 14:50:03 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 09DDA1065675 for ; Sat, 17 Apr 2010 14:50:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id C44678FC0A for ; Sat, 17 Apr 2010 14:50:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o3HEo2Eu079080 for ; Sat, 17 Apr 2010 14:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o3HEo21O079079; Sat, 17 Apr 2010 14:50:02 GMT (envelope-from gnats) Resent-Date: Sat, 17 Apr 2010 14:50:02 GMT Resent-Message-Id: <201004171450.o3HEo21O079079@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jille Timmermans Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C6A99106566C for ; Sat, 17 Apr 2010 14:41:06 +0000 (UTC) (envelope-from quis@quis.cx) Received: from istud.quis.cx (56-64-223.ftth.xms.internl.net [85.223.64.56]) by mx1.freebsd.org (Postfix) with ESMTP id 520FD8FC13 for ; Sat, 17 Apr 2010 14:41:06 +0000 (UTC) Received: by istud.quis.cx (Postfix, from userid 1000) id 32D6161082A; Sat, 17 Apr 2010 16:23:09 +0200 (CEST) Message-Id: <20100417142309.32D6161082A@istud.quis.cx> Date: Sat, 17 Apr 2010 16:23:09 +0200 (CEST) From: Jille Timmermans To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/145779: [patch] audio/icecast2: rc setting icecast_config X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Jille Timmermans List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Apr 2010 14:50:03 -0000 >Number: 145779 >Category: ports >Synopsis: [patch] audio/icecast2: rc setting icecast_config >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Apr 17 14:50:01 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Jille Timmermans >Release: FreeBSD 8.0-STABLE amd64 >Organization: Private >Environment: System: FreeBSD istud.quis.cx 8.0-STABLE FreeBSD 8.0-STABLE #0 r203672: Mon Feb 8 20:23:01 CET 2010 quis@istud.quis.cx:/usr/obj/usr/src/sys/ISTUD amd64 >Description: This patch adds the rc.conf setting to specify another config file than the default of /usr/local/etc/icecast.xml. >How-To-Repeat: >Fix: --- icecast2 (from port) +++ icecast2 (my version) @@ -8,12 +8,16 @@ # BEFORE: LOGIN # KEYWORD: shutdown -# Add the following line to /etc/rc.conf to enable `icecast2'. This requires -# a working configuration in /usr/local/etc/icecast.xml. +# Add the following line to /etc/rc.conf to enable `icecast2'. # #icecast_enable="YES" # -# Make sure the section in your /usr/local/etc/icecast.xml is +# You can specify another configuration file than /usr/local/etc/icecast.xml +# by adding the following line. +# +#icecast_config="/usr/local/etc/icecast.xml" +# +# Make sure the section in your configuration file is # not commented out - icecast refuses to run as root. # @@ -24,11 +24,13 @@ command="/usr/local/bin/icecast" command_args="-b 1>/dev/null" -required_files="/usr/local/etc/$name.xml" # read configuration and set defaults load_rc_config "$name" : ${icecast_enable="NO"} -: ${icecast_flags="-c ${required_files}"} +: ${icecast_config="/usr/local/etc/$name.xml"} +: ${icecast_flags="-c ${icecast_config}"} + +required_files="${icecast_config}" run_rc_command "$1" >Release-Note: >Audit-Trail: >Unformatted: