[DebianGIS-dev] CVS Update: musmap/debian packages packages.config packages.install

[mparent-guest at haydn.debian.org]

  User: mparent-guest
  Date: 06/03/28 14:47:31

  Modified:    debian   packages packages.config packages.install
  Log:
  Better apache handling (reload)
  
  Revision  Changes    Path
  1.4       +1 -1      musmap/debian/packages
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/musmap/debian/packages?annotate=1.4&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/musmap/debian/packages?rev=1.4&content-type=text/x-cvsweb-markup&cvsroot=
  
  CVSWeb: Diff to previous version:   http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/musmap/debian/packages.diff?r1=1.4&r2=1.3&cvsroot=
  
  -----------------------------------
  
  Index: packages
  ===================================================================
  RCS file: /cvsroot/pkg-grass/musmap/debian/packages,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- packages	16 Jan 2006 21:59:12 -0000	1.3
  +++ packages	28 Mar 2006 14:47:31 -0000	1.4
  @@ -40,7 +40,7 @@
   Install: sh
   %`sed -e 's/^$/./' -e 's/^/ /' debian/packages.install`
   Finalise: sh
  - chown www-data:www-data debian/tmp-musmap/usr/share/musmap/webtmp
  + chown www-data:www-data debian/tmp-musmap/var/cache/musmap/webtmp
   Templates:
   %`sed -e 's/^$/./' -e 's/^/ /' debian/packages.templates`
   Config: sh
  
  
  
  1.5       +1 -0      musmap/debian/packages.config
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/musmap/debian/packages.config?annotate=1.5&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/musmap/debian/packages.config?rev=1.5&content-type=text/x-cvsweb-markup&cvsroot=
  
  CVSWeb: Diff to previous version:   http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/musmap/debian/packages.config.diff?r1=1.5&r2=1.4&cvsroot=
  
  -----------------------------------
  
  Index: packages.config
  ===================================================================
  RCS file: /cvsroot/pkg-grass/musmap/debian/packages.config,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- packages.config	28 Mar 2006 12:47:00 -0000	1.4
  +++ packages.config	28 Mar 2006 14:47:31 -0000	1.5
  @@ -199,5 +199,6 @@
    echo ""
    echo "// -------- EXTRA CONF ------------------- //"
    echo "  Conf::Set('log_dir', '/var/log/musmap/');"
  + echo "  Conf::Set('image_path', '/var/cache/musmap/webtmp/');"
    echo "  Conf::Set('tmp_dir', '/tmp/');"
    echo "?>") > /etc/musmap/db_config.php
  \ No newline at end of file
  
  
  
  1.4       +9 -4      musmap/debian/packages.install
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/musmap/debian/packages.install?annotate=1.4&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/musmap/debian/packages.install?rev=1.4&content-type=text/x-cvsweb-markup&cvsroot=
  
  CVSWeb: Diff to previous version:   http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/musmap/debian/packages.install.diff?r1=1.4&r2=1.3&cvsroot=
  
  -----------------------------------
  
  Index: packages.install
  ===================================================================
  RCS file: /cvsroot/pkg-grass/musmap/debian/packages.install,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- packages.install	16 Jan 2006 21:58:44 -0000	1.3
  +++ packages.install	28 Mar 2006 14:47:31 -0000	1.4
  @@ -6,8 +6,7 @@
   #== Temporary server files
   #/tmp
   #== Temporary files, available thru web server
  -yada install -dir /var/lib/musmap/webtmp
  -yada install -dir /usr/share/musmap/webtmp
  +yada install -dir /var/cache/musmap/webtmp
   #== Doc
   #ignore: COPYRIGHT, LICENSE.LGPL, LICENSE, INSTALL
   yada install -doc TODO CHANGELOG
  @@ -21,5 +20,11 @@
   #== Apache config
   for webserver in apache apache-perl apache-ssl apache2; do
       yada install -conf -ucf -into /etc/$webserver/conf.d -as musmap.conf debian/conf/apache.conf
  -done
  -yada symlink -into /var/www /usr/share/musmap
  \ No newline at end of file
  +    if [ -f /var/run/$webserver.pid ]; then
  +      if [ -x /usr/sbin/invoke-rc.d ]; then 
  +        invoke-rc.d $webserver reload > /dev/null; 
  +      else 
  +        /etc/init.d/$webserver reload > /dev/null; 
  +      fi; 
  +   fi;
  +done
  \ No newline at end of file