Update bweb deb

diff --git a/gui/debian/bweb.dirs b/gui/debian/bweb.dirs
index 4a8958fabdf8178dc3526ed674e1e2ea38f480c6..a4668161dbe512b9c2606502aeb7e22245712883 100644 (file)
--- a/gui/debian/bweb.dirs
+++ b/gui/debian/bweb.dirs
@@ -1,5 +1,5 @@
 etc/bacula
-etc/apache2/conf.d
+etc/apache2/sites-available
 usr/lib/cgi-bin/bweb
 usr/share/doc/bweb
 usr/share/bweb

diff --git a/gui/debian/bweb.postinst b/gui/debian/bweb.postinst
index a62117bf14dae3c25718ceba7164640be2dd88ad..6f183ebb0242f7370c3b6fd385a9167174754a10 100644 (file)
--- a/gui/debian/bweb.postinst
+++ b/gui/debian/bweb.postinst
@@ -19,7 +19,7 @@ if [ "$1" = "configure" ] ; then
 
  chown www-data:root /var/spool/bweb
  chmod 700 /var/spool/bweb
- 
+
  echo
  echo "If you are using postgresql, you have to load /usr/share/bweb/bweb-postgresql.sql in your database"
  
@@ -29,8 +29,8 @@ if [ "$1" = "configure" ] ; then
  echo "If you are using mysql, you have to load /usr/share/bweb/bweb-mysql.sql in your database"
  echo "root@localhost:~$ mysql bacula < /usr/share/bweb/bweb-mysql.sql"
  echo
- echo "You can use user/passwd (see /etc/apache/conf.d/bweb.conf)"
- echo "You have to reload your apache configuration"
+ echo "You can use user/passwd (see /etc/apache2/sites-available/bweb.conf)"
+ echo "You have to enable bweb.conf (a2ensite) and reload your apache configuration"
  echo 
  echo "'/usr/bin/bconsole -n -c /etc/bacula/bconsole.conf' must be accessible"
  echo "by your www-data. You meed to use :"

diff --git a/gui/debian/changelog b/gui/debian/changelog
index 8f75132920fd3cabd14b8b6eb7b4382910c54484..380763ca17634b9b0746bc706e2d0a353fce2a13 100644 (file)
--- a/gui/debian/changelog
+++ b/gui/debian/changelog
@@ -1,3 +1,8 @@
+bweb (3.0.1-2) stable; urgency=low
+  * Change /etc/apache to /etc/apache2
+
+ -- Eric Bollengier <eric@eb.homelinux.org>  Sat,  19 Dec 2009 19:15:47 +0000
+
 bweb (3.0.1-1) stable; urgency=low
   * Add View copies option to bresto
   * Tweak command output to add hide/display button

diff --git a/gui/debian/rules b/gui/debian/rules
index 455e8581787b94100f0ed6adae64cbe950111bfc..5f7d81a0504ef7640101f8a42de6b1090d86f9e6 100755 (executable)
--- a/gui/debian/rules
+++ b/gui/debian/rules
@@ -53,7 +53,7 @@ install-indep:
        install -m 644 bweb/lib/Bweb.pm debian/bweb/usr/share/perl5
        install -m 644 bweb/lib/GTime.pm debian/bweb/usr/share/perl5
        install -m 644 bweb/lib/GBalloon.pm debian/bweb/usr/share/perl5
-       install -m 644 bweb/script/bweb.conf debian/bweb/etc/apache2/conf.d
+       install -m 644 bweb/script/bweb.conf debian/bweb/etc/apache2/sites-available
        install -m 755 bweb/cgi/bgraph.pl debian/bweb/usr/lib/cgi-bin/bweb
        install -m 755 bweb/cgi/bweb.pl debian/bweb/usr/lib/cgi-bin/bweb
        install -m 755 bweb/cgi/btime.pl debian/bweb/usr/lib/cgi-bin/bweb