[pkg-bacula-commits] [bacula] 32/35: Get rid of useless common-functions

[Carsten Leonhardt]

This is an automated email from the git hooks/post-receive script.

leo pushed a commit to tag development/2011-04-29
in repository bacula.

commit aea2145a4f135fa6d18d33384a1af2c2bffc8617
Author: Jan Hauke Rahm <jhr at debian.org>
Date:   Fri Apr 29 09:57:26 2011 +0200

    Get rid of useless common-functions
---
 debian/bacula-common.install                       |  1 -
 debian/bacula-common.postinst                      |  4 --
 debian/bacula-director-common.bacula-director.init |  8 +---
 debian/bacula-fd.init                              |  5 ---
 debian/bacula-sd.init                              |  4 --
 debian/common-functions                            | 49 ----------------------
 6 files changed, 1 insertion(+), 70 deletions(-)

diff --git a/debian/bacula-common.install b/debian/bacula-common.install
index 9425e8e..11eb93e 100644
--- a/debian/bacula-common.install
+++ b/debian/bacula-common.install
@@ -6,4 +6,3 @@ usr/lib/bacula/libbac-*.so
 usr/lib/bacula/libbacpy*.so
 usr/sbin/btraceback		usr/lib/bacula
 usr/sbin/bsmtp			usr/lib/bacula
-debian/common-functions		usr/share/bacula-common
diff --git a/debian/bacula-common.postinst b/debian/bacula-common.postinst
index edc0595..ea0f474 100644
--- a/debian/bacula-common.postinst
+++ b/debian/bacula-common.postinst
@@ -11,10 +11,6 @@ case "$1" in
 	chmod 700 /var/lib/bacula
 	chown bacula:adm /var/log/bacula
 	chmod 750 /var/log/bacula
-
-        . /usr/share/bacula-common/common-functions
-        readOrCreatePasswords # create our common passwords if needed
-
     ;;
 esac
 
diff --git a/debian/bacula-director-common.bacula-director.init b/debian/bacula-director-common.bacula-director.init
index 777d1ef..1e12cb9 100644
--- a/debian/bacula-director-common.bacula-director.init
+++ b/debian/bacula-director-common.bacula-director.init
@@ -29,19 +29,14 @@ if [ -n "`getent services bacula-dir`" ]; then
         PORT=`getent services bacula-dir | awk '{ gsub("/tcp","",$2); print $2; }'`
 fi
  
-
-PIDFILE=/var/run/bacula/$NAME.$PORT.pid
-
 . /lib/lsb/init-functions
-. /usr/share/bacula-common/common-functions
 if [ -r /etc/default/bacula-dir ]; then
 	. /etc/default/bacula-dir
 fi
 
+PIDFILE=/var/run/bacula/$NAME.$PORT.pid
 CONFIG="${CONFIG:-/etc/bacula/bacula-fd.conf}"
 
-create_var_run_dir
-
 get_pid()
 {
 	if [ -r "$1" ]; then pid="`cat $1`"; 
@@ -103,7 +98,6 @@ case "$1" in
 		exit 0
 	fi
 
-	create_var_run_dir
 	log_daemon_msg "Starting $DESC..."
         if do_start ; then
                 log_end_msg 0
diff --git a/debian/bacula-fd.init b/debian/bacula-fd.init
index d368306..734c947 100644
--- a/debian/bacula-fd.init
+++ b/debian/bacula-fd.init
@@ -31,16 +31,11 @@ if [ -n "`getent services bacula-fd`" ]; then
 fi
 
 . /lib/lsb/init-functions
-. /usr/share/bacula-common/common-functions
 if [ -r /etc/default/bacula-fd ]; then
 	. /etc/default/bacula-fd
 fi
 
 CONFIG="${CONFIG:-/etc/bacula/bacula-fd.conf}"
-
-create_var_run_dir
-
-
 PIDFILE=/var/run/bacula/$NAME.$PORT.pid
 
 do_start()
diff --git a/debian/bacula-sd.init b/debian/bacula-sd.init
index a0e587e..1bc666c 100644
--- a/debian/bacula-sd.init
+++ b/debian/bacula-sd.init
@@ -29,15 +29,11 @@ if [ -n "`getent services bacula-sd`" ]; then
 fi
 
 . /lib/lsb/init-functions
-. /usr/share/bacula-common/common-functions
 if [ -r /etc/default/bacula-sd ]; then
 	. /etc/default/bacula-sd
 fi
 
 CONFIG="${CONFIG:-/etc/bacula/bacula-fd.conf}"
-
-create_var_run_dir
-
 PIDFILE=/var/run/bacula/$NAME.$PORT.pid
 
 do_start()
diff --git a/debian/common-functions b/debian/common-functions
deleted file mode 100644
index 5385711..0000000
--- a/debian/common-functions
+++ /dev/null
@@ -1,49 +0,0 @@
-create_var_run_dir()
-{
-	if [ ! -d /var/run/bacula/ ]; then
-		mkdir -p -m 0755 /var/run/bacula/
-		chown bacula:daemon /var/run/bacula/
-	fi
-}
-
-genRandomPassword()
-{
-    cat /dev/urandom | tr -dc _A-Z-a-z-0-9 | head -c33
-}
-
-readOrCreatePasswords()
-{
-    BACULAPWFILE=/etc/bacula/common_default_passwords
-    if [ -f $BACULAPWFILE ]; then
-        . $BACULAPWFILE
-    fi
-
-    if [ -z "$DIRPASSWD" -o -z "$DIRMPASSWD" -o -z "$SDPASSWD" -o \
-         -z "$SDMPASSWD" -o -z "$FDPASSWD" -o -z "$FDMPASSWD" ] ; then
-        # Create the passwords.
-        DIRPASSWD=`genRandomPassword`
-        DIRMPASSWD=`genRandomPassword`
-        SDPASSWD=`genRandomPassword`
-        SDMPASSWD=`genRandomPassword`
-        FDPASSWD=`genRandomPassword`
-        FDMPASSWD=`genRandomPassword`
-
-        # Save the passwords.
-        echo "# " > $BACULAPWFILE
-        chown root:root $BACULAPWFILE
-        chmod 0600 $BACULAPWFILE
-        cat >>$BACULAPWFILE <<EOF
-# This file holds defaults for new Bacula packages installed on this system.
-# It is used only when you install a new Bacula package, and can be
-# safely removed at any time.
-
-DIRPASSWD=$DIRPASSWD
-DIRMPASSWD=$DIRMPASSWD
-SDPASSWD=$SDPASSWD
-SDMPASSWD=$SDMPASSWD
-FDPASSWD=$FDPASSWD
-FDMPASSWD=$FDMPASSWD
-EOF
-    fi
-}
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git