Attachment 291706 Details for Bug 428799 – openserdbctl patch to read config from /etc too

[patch] openserdbctl patch to read config from /etc too

openserdbctl.patch (text/plain), 1.65 KB, created by Jan ONDREJ on 2008-01-15 12:18:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan ONDREJ

Created: 2008-01-15 12:18:03 UTC

Size: 1.65 KB

patch

obsolete

>Index: openserdbctl
>===================================================================
>--- openserdbctl	(revision 3518)
>+++ openserdbctl	(working copy)
>@@ -7,37 +7,29 @@
> #===================================================================
> 
> PATH=$PATH:/usr/local/sbin/
>+TEST="false"
> 
>-
> ### include resource files, if any
>+if [ -f /etc/openser/openserctlrc ]; then
>+	. /etc/openser/openserctlrc
>+fi
> if [ -f /usr/local/etc/openser/openserctlrc ]; then
> 	. /usr/local/etc/openser/openserctlrc
> fi
> if [ -f ~/.openserctlrc ]; then
> 	. ~/.openserctlrc
> fi
>-### for testing only
>-if [ -f ./openserctlrc ]; then
>-	. ./openserctlrc
>+# for testing only, please don't enable this in production environments
>+# as this introduce security risks
>+if [ $TEST = "true" ]; then
>+	if [ -f ./openserctlrc ]; then
>+		. ./openserctlrc
>+	fi
> fi
> 
> 
>-##### ------------------------------------------------ #####
>-### force values for variables in this section
>-#
>-
>-# you better set the variables in ~/.openserctlrc
>-
>-
>-if [ -z "$ETCDIR" ] ; then
>-	ETCDIR="/usr/local/etc/openser"
>-fi
>-
>-##### ------------------------------------------------ #####
>-### 
>-#
> ### version for this script
>-VERSION='1.3dev - $Revision$'
>+VERSION='$Revision$'
> 
> if [ -z "$MYDIR" ] ; then
> 	MYDIR=`dirname $0`
>@@ -51,13 +43,6 @@
> fi
> 
> 
>-# force values for variables in this section
>-# you better set the variables in ~/.openserctlrc
>-if [ -z "$ETCDIR" ] ; then
>-	ETCDIR="/usr/local/etc/openser"
>-fi
>-
>-
> ##### ------------------------------------------------ #####
> ### load base functions
> #
>@@ -298,6 +283,9 @@
> 		openser_berkeley "$@"
> 		exit $?
> 		;;
>+	version)
>+		echo  "$0 $VERSION"
>+		;;
> 	*)
> 		usage
> 		exit 1;

Actions: View | Diff

Attachments on bug 428799: 291706