Attachment 54696 Details for Bug 82747 – file.diff

[patch] file.diff

file.diff (text/plain), 3.47 KB, created by kelley on 2005-06-28 22:00:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: kelley

Created: 2005-06-28 22:00:37 UTC

Size: 3.47 KB

patch

obsolete

>diff -ruN daedalus.bak/Makefile daedalus/Makefile
>--- daedalus.bak/Makefile       Fri Nov  5 08:03:45 2004
>+++ daedalus/Makefile   Tue Jun 28 16:36:18 2005
>@@ -6,9 +6,9 @@
> #
> 
> PORTNAME=      daedalus
>-PORTVERSION=   1.1
>+PORTVERSION=   2.0
> CATEGORIES=    sysutils
>-MASTER_SITES=  ftp://ftp.verbotenplanet.net/daedalus/
>+MASTER_SITES=  ftp://ftp.insidesystems.net/daedalus/
> 
> MAINTAINER=    kelley@insidesystems.net
> COMMENT=       Flexible process monitor/restart daemon written in ruby
>@@ -30,7 +30,9 @@
> 
> do-install:
>        ${INSTALL_SCRIPT} ${WRKSRC}/daedalus.rb ${PREFIX}/bin/daedalus.rb
>-       ${INSTALL_DATA} ${WRKSRC}/examples/daedalus.conf ${PREFIX}/etc/daedalus.conf.sample
>+       ${MKDIR} ${PREFIX}/etc/daedalus
>+       ${INSTALL_DATA} ${WRKSRC}/examples/daedalus.xml ${PREFIX}/etc/daedalus/daedalus.xml.sample
>+       ${INSTALL_DATA} ${WRKSRC}/examples/templates.xml ${PREFIX}/etc/daedalus/templates.xml.sample
>        ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/etc/rc.d/${PORTNAME}.sh
> 
> post-install:
>diff -ruN daedalus.bak/distinfo daedalus/distinfo
>--- daedalus.bak/distinfo       Fri Nov  5 08:03:45 2004
>+++ daedalus/distinfo   Tue Jun 28 16:35:42 2005
>@@ -1,2 +1,2 @@
>-MD5 (daedalus-1.1.tar.gz) = 5b103455802177ca8a6a2cb126630167
>-SIZE (daedalus-1.1.tar.gz) = 33898
>+MD5 (daedalus-2.0.tar.gz) = 2e343ef365f19c98b9530bfb033efade
>+SIZE (daedalus-2.0.tar.gz) = 26192
>diff -ruN daedalus.bak/files/daedalus.sh daedalus/files/daedalus.sh
>--- daedalus.bak/files/daedalus.sh      Fri Nov  5 08:03:46 2004
>+++ daedalus/files/daedalus.sh  Tue Jun 28 16:40:48 2005
>@@ -7,7 +7,7 @@
> # Add the following line to /etc/rc.conf to enable daedalus:
> # daedalus_enable (bool):      Set to "NO" by default.
> #                             Set it to "YES" to enable daedalus
>-# daedalus_flags (str):        Set to "-C -c %%PREFIX%%/etc/daedalus.conf" by default.
>+# daedalus_flags (str):        Set to "-c %%PREFIX%%/etc/daedalus/daedalus.xml -t %%PREFIX%%/etc/daedalus/templates.xml" by default.
> #                             Extra flags passed to start command
> #
> . %%RC_SUBR%%
>@@ -18,10 +18,10 @@
> command="%%PREFIX%%/bin/daedalus.rb"
> pidfile="/var/run/daedalus.pid"
> command_interpreter="%%RUBY_WITHOUT_SUFFIX%%"
>-required_files=%%PREFIX%%/etc/daedalus.conf
>+required_files=%%PREFIX%%/etc/daedalus/daedalus.xml
> 
> [ -z "$daedalus_enable" ]       && daedalus_enable="NO"
>-[ -z "$daedalus_flags" ]        && daedalus_flags="-C -c %%PREFIX%%/etc/daedalus.conf"
>+[ -z "$daedalus_flags" ]        && daedalus_flags="-c %%PREFIX%%/etc/daedalus/daedalus.xml -t %%PREFIX%%/etc/daedalus/templates.xml"
> 
> load_rc_config $name
> 
>diff -ruN daedalus.bak/pkg-message daedalus/pkg-message
>--- daedalus.bak/pkg-message    Fri Nov  5 08:03:45 2004
>+++ daedalus/pkg-message        Tue Jun 28 16:42:24 2005
>@@ -2,6 +2,12 @@
> IMPORTANT NOTE:
> ===============
> 
>+If you are upgrading from a version previous to 2.0, the 
>+location and layout of the configuration files has changed.
>+They are now in XML and a templates.xml file can be referenced
>+that allows updating of templates from machine to
>+machine without disrupting the actual checks being performed.
>+
> To use daedalus, be sure to include
> 
> daedalus_enable="YES"
>diff -ruN daedalus.bak/pkg-plist daedalus/pkg-plist
>--- daedalus.bak/pkg-plist      Fri Nov  5 08:03:45 2004
>+++ daedalus/pkg-plist  Tue Jun 28 16:31:55 2005
>@@ -1,3 +1,5 @@
> bin/daedalus.rb
> etc/rc.d/daedalus.sh
>-etc/daedalus.conf.sample
>+etc/daedalus/daedalus.xml.sample
>+etc/daedalus/templates.xml.sample
>+@dirrm etc/daedalus

Actions: View | Diff

Attachments on bug 82747: 54696