[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gforge-commits] %s
|
From: |
Christian Bayle,,, |
|
Subject: |
[Gforge-commits] %s |
|
Date: |
Tue, 18 Jan 2005 00:43:46 +0000 |
Update of /cvsroot/gforge/gforge/debian
In directory db.perdue.net:/tmp/cvs-serv29393/debian
Modified Files:
changelog gforge-db-postgresql.postinst.dsfh-in
gforge-dns-bind9.postinst.dsfh-in
gforge-ftp-proftpd.postinst.dsfh-in
gforge-ldap-openldap.postinst.dsfh-in
gforge-mta-exim.postinst.dsfh-in
gforge-mta-exim4.postinst.dsfh-in
gforge-mta-postfix.postinst.dsfh-in
gforge-shell-ldap.postinst.dsfh-in
gforge-shell-postgresql.postinst.dsfh-in
gforge-web-apache.postinst.dsfh-in
Log Message:
Changing replace-file config and postinst dsf-helper behaviour
Index: gforge-dns-bind9.postinst.dsfh-in
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/gforge-dns-bind9.postinst.dsfh-in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gforge-dns-bind9.postinst.dsfh-in 17 Jan 2005 20:58:05 -0000 1.5
--- gforge-dns-bind9.postinst.dsfh-in 18 Jan 2005 00:43:43 -0000 1.6
***************
*** 26,30 ****
. /usr/share/debconf/confmodule
! #NODSFHELPER:replace-files#
case "$1" in
configure)
--- 26,30 ----
. /usr/share/debconf/confmodule
! #DSFHELPER:replace-files#
case "$1" in
configure)
***************
*** 37,44 ****
# Patch Bind configuration files
/usr/lib/gforge/bin/install-dns.sh configure-files
! # propose_update_install /etc/bind/named.conf
!
! # Clean debconf after ourselves
! # db_stop
# Create the DNS zone
--- 37,41 ----
# Patch Bind configuration files
/usr/lib/gforge/bin/install-dns.sh configure-files
! replace_file /etc/bind/named.conf
# Create the DNS zone
Index: gforge-mta-exim4.postinst.dsfh-in
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/gforge-mta-exim4.postinst.dsfh-in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gforge-mta-exim4.postinst.dsfh-in 16 Jan 2005 12:53:15 -0000 1.3
--- gforge-mta-exim4.postinst.dsfh-in 18 Jan 2005 00:43:43 -0000 1.4
***************
*** 26,30 ****
. /usr/share/debconf/confmodule
! #NODSFHELPER:replace-files#
case "$1" in
configure)
--- 26,30 ----
. /usr/share/debconf/confmodule
! #DSFHELPER:replace-files#
case "$1" in
configure)
***************
*** 33,44 ****
# Patch Exim configuration files
/usr/lib/gforge/bin/install-exim4.sh configure-files
! # propose_update_install /etc/aliases
! # propose_update_install /etc/exim4/exim4.conf
! # propose_update_install /etc/exim4/exim4.conf.template
! # propose_update_install
/etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs
!
! # Clean debconf after ourselves
! # db_stop
!
;;
--- 33,40 ----
# Patch Exim configuration files
/usr/lib/gforge/bin/install-exim4.sh configure-files
! replace_file /etc/aliases
! replace_file /etc/exim4/exim4.conf
! replace_file /etc/exim4/exim4.conf.template
! replace_file /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs
;;
Index: gforge-ldap-openldap.postinst.dsfh-in
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/gforge-ldap-openldap.postinst.dsfh-in,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** gforge-ldap-openldap.postinst.dsfh-in 16 Jan 2005 12:53:15 -0000
1.11
--- gforge-ldap-openldap.postinst.dsfh-in 18 Jan 2005 00:43:43 -0000
1.12
***************
*** 26,45 ****
. /usr/share/debconf/confmodule
! #NODSFHELPER:replace-files#
case "$1" in
configure)
/usr/sbin/gforge-config
! # Patch Slapd configuration files
/usr/lib/gforge/bin/install-ldap.sh configure-files
! # propose_update_install /etc/libnss-ldap.conf
! # propose_update_install /etc/nsswitch.conf
! # propose_update_install /etc/ldap/slapd.conf
!
! # Clean debconf after ourselves
! # db_stop
# Setup our LDAP
err=0
/usr/lib/gforge/bin/install-ldap.sh configure || err=$?
case $err in
--- 26,45 ----
. /usr/share/debconf/confmodule
! #DSFHELPER:replace-files#
case "$1" in
configure)
+ db_stop
/usr/sbin/gforge-config
! # Patch Slapd configuration files creation .gforge-new ones
/usr/lib/gforge/bin/install-ldap.sh configure-files
! replace_file /etc/libnss-ldap.conf
! replace_file /etc/nsswitch.conf
! replace_file /etc/ldap/slapd.conf
# Setup our LDAP
err=0
+ if [ -f /etc/ldap/slapd.conf.gforge-old ]
+ then
/usr/lib/gforge/bin/install-ldap.sh configure || err=$?
case $err in
***************
*** 95,98 ****
--- 95,99 ----
;;
esac
+ fi
;;
Index: gforge-mta-exim.postinst.dsfh-in
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/gforge-mta-exim.postinst.dsfh-in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gforge-mta-exim.postinst.dsfh-in 16 Jan 2005 12:53:15 -0000 1.4
--- gforge-mta-exim.postinst.dsfh-in 18 Jan 2005 00:43:43 -0000 1.5
***************
*** 26,30 ****
. /usr/share/debconf/confmodule
! #NODSFHELPER:replace-files#
case "$1" in
configure)
--- 26,30 ----
. /usr/share/debconf/confmodule
! #DSFHELPER:replace-files#
case "$1" in
configure)
***************
*** 33,42 ****
# Patch Exim configuration files
/usr/lib/gforge/bin/install-exim.sh configure-files
! # propose_update_install /etc/aliases
! # propose_update_install /etc/exim/exim.conf
!
! # Clean debconf after ourselves
! # db_stop
!
;;
--- 33,38 ----
# Patch Exim configuration files
/usr/lib/gforge/bin/install-exim.sh configure-files
! replace_file /etc/aliases
! replace_file /etc/exim/exim.conf
;;
Index: changelog
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/changelog,v
retrieving revision 1.398
retrieving revision 1.399
diff -C2 -d -r1.398 -r1.399
*** changelog 17 Jan 2005 20:58:05 -0000 1.398
--- changelog 18 Jan 2005 00:43:43 -0000 1.399
***************
*** 1,7 ****
! gforge (4.0.2-5) unstable; urgency=low
* [Christian] Let's go for 4.0
* [Christian] Had to add a db_stop before gforge-config in
* ftp and dns postinst scripts, quite strange
-- Christian Bayle <address@hidden> Sun, 16 Jan 2005 13:34:05 +0100
--- 1,12 ----
! gforge (4.0.2-5c) unstable; urgency=low
* [Christian] Let's go for 4.0
* [Christian] Had to add a db_stop before gforge-config in
* ftp and dns postinst scripts, quite strange
+ * [Christian] Now do a replace file in postinst if replace was wanted.
+ during config by changing dsf-helper replace-file functions.
+ Now at replace I make a copy of conffile to conffile.dpkg-old
+ At postinst, if conffile.dpkg-old exists conffile is
+ replaced with conffile.dpkg-new
-- Christian Bayle <address@hidden> Sun, 16 Jan 2005 13:34:05 +0100
Index: gforge-shell-ldap.postinst.dsfh-in
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/gforge-shell-ldap.postinst.dsfh-in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gforge-shell-ldap.postinst.dsfh-in 16 Jan 2005 12:53:15 -0000 1.6
--- gforge-shell-ldap.postinst.dsfh-in 18 Jan 2005 00:43:43 -0000 1.7
***************
*** 26,30 ****
. /usr/share/debconf/confmodule
! #NODSFHELPER:replace-files#
case "$1" in
configure)
--- 26,30 ----
. /usr/share/debconf/confmodule
! #DSFHELPER:replace-files#
case "$1" in
configure)
***************
*** 33,42 ****
# Patch Slapd configuration files
/usr/lib/gforge/bin/install-ldap.sh configure-files
! # propose_update_install /etc/libnss-ldap.conf
! # propose_update_install /etc/nsswitch.conf
! # propose_update_install /etc/ldap/slapd.conf
!
! # Clean debconf after ourselves
! # db_stop
# Install the chroot environment
--- 33,39 ----
# Patch Slapd configuration files
/usr/lib/gforge/bin/install-ldap.sh configure-files
! replace_file /etc/libnss-ldap.conf
! replace_file /etc/nsswitch.conf
! replace_file /etc/ldap/slapd.conf
# Install the chroot environment
Index: gforge-shell-postgresql.postinst.dsfh-in
===================================================================
RCS file:
/cvsroot/gforge/gforge/debian/gforge-shell-postgresql.postinst.dsfh-in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gforge-shell-postgresql.postinst.dsfh-in 16 Jan 2005 12:53:15 -0000
1.2
--- gforge-shell-postgresql.postinst.dsfh-in 18 Jan 2005 00:43:43 -0000
1.3
***************
*** 26,30 ****
. /usr/share/debconf/confmodule
! #NODSFHELPER:replace-files#
case "$1" in
configure)
--- 26,30 ----
. /usr/share/debconf/confmodule
! #DSFHELPER:replace-files#
case "$1" in
configure)
***************
*** 33,41 ****
# Patch Slapd configuration files
/usr/lib/gforge/bin/install-nsspgsql.sh configure-files
! # propose_update_install /etc/nss-pgsql.conf
! # propose_update_install /etc/nsswitch.conf
!
! # Clean debconf after ourselves
! # db_stop
# Install the chroot environment
--- 33,38 ----
# Patch Slapd configuration files
/usr/lib/gforge/bin/install-nsspgsql.sh configure-files
! replace_file /etc/nss-pgsql.conf
! replace_file /etc/nsswitch.conf
# Install the chroot environment
Index: gforge-mta-postfix.postinst.dsfh-in
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/gforge-mta-postfix.postinst.dsfh-in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gforge-mta-postfix.postinst.dsfh-in 16 Jan 2005 12:53:15 -0000 1.4
--- gforge-mta-postfix.postinst.dsfh-in 18 Jan 2005 00:43:43 -0000 1.5
***************
*** 26,30 ****
. /usr/share/debconf/confmodule
! #NODSFHELPER:replace-files#
case "$1" in
configure)
--- 26,30 ----
. /usr/share/debconf/confmodule
! #DSFHELPER:replace-files#
case "$1" in
configure)
***************
*** 33,42 ****
# Patch Postfix configuration files
/usr/lib/gforge/bin/install-postfix.sh configure-files
! # propose_update_install /etc/aliases
! # propose_update_install /etc/postfix/main.cf
!
! # Clean debconf after ourselves
! # db_stop
!
;;
--- 33,38 ----
# Patch Postfix configuration files
/usr/lib/gforge/bin/install-postfix.sh configure-files
! replace_file /etc/aliases
! replace_file /etc/postfix/main.cf
;;
Index: gforge-ftp-proftpd.postinst.dsfh-in
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/gforge-ftp-proftpd.postinst.dsfh-in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gforge-ftp-proftpd.postinst.dsfh-in 17 Jan 2005 20:58:05 -0000 1.6
--- gforge-ftp-proftpd.postinst.dsfh-in 18 Jan 2005 00:43:43 -0000 1.7
***************
*** 26,30 ****
. /usr/share/debconf/confmodule
! #NODSFHELPER:replace-files#
case "$1" in
configure)
--- 26,30 ----
. /usr/share/debconf/confmodule
! #DSFHELPER:replace-files#
case "$1" in
configure)
***************
*** 37,44 ****
# Patch Proftpd configuration files
/usr/lib/gforge/bin/install-ftp.sh configure-files
! # propose_update_install /etc/proftpd.conf
!
! # Clean debconf after ourselves
! # db_stop
# Setup our FTP
--- 37,41 ----
# Patch Proftpd configuration files
/usr/lib/gforge/bin/install-ftp.sh configure-files
! replace_file /etc/proftpd.conf
# Setup our FTP
Index: gforge-db-postgresql.postinst.dsfh-in
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/gforge-db-postgresql.postinst.dsfh-in,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** gforge-db-postgresql.postinst.dsfh-in 16 Jan 2005 12:53:15 -0000
1.8
--- gforge-db-postgresql.postinst.dsfh-in 18 Jan 2005 00:43:43 -0000
1.9
***************
*** 26,30 ****
. /usr/share/debconf/confmodule
! #NODSFHELPER:replace-files#
#DSFHELPER:handle-mainconffile#
case "$1" in
--- 26,30 ----
. /usr/share/debconf/confmodule
! #DSFHELPER:replace-files#
#DSFHELPER:handle-mainconffile#
case "$1" in
***************
*** 36,43 ****
# Patch DB configuration files
/usr/lib/gforge/bin/install-db.sh configure-files
! # propose_update_install /etc/postgresql/pg_hba.conf
!
! # Clean debconf after ourselves
! # db_stop
# Setup our DB
--- 36,40 ----
# Patch DB configuration files
/usr/lib/gforge/bin/install-db.sh configure-files
! replace_file /etc/postgresql/pg_hba.conf
# Setup our DB
Index: gforge-web-apache.postinst.dsfh-in
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/gforge-web-apache.postinst.dsfh-in,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** gforge-web-apache.postinst.dsfh-in 16 Jan 2005 12:53:15 -0000 1.15
--- gforge-web-apache.postinst.dsfh-in 18 Jan 2005 00:43:43 -0000 1.16
***************
*** 26,30 ****
. /usr/share/debconf/confmodule
! #NODSFHELPER:replace-files#
#DSFHELPER:handle-mainconffile#
--- 26,30 ----
. /usr/share/debconf/confmodule
! #DSFHELPER:replace-files#
#DSFHELPER:handle-mainconffile#
***************
*** 56,65 ****
# Patch Apache configuration files
/usr/lib/gforge/bin/install-apache.sh configure-files
! # for flavour in apache apache-perl apache-ssl ; do
! # [ -e /etc/$flavour/httpd.conf ] && propose_update_install
/etc/$flavour/httpd.conf
! # done
! # propose_update_install /etc/php4/apache/php.ini
! # propose_update_install /etc/php4/cgi/php.ini
# Setup our Apache
--- 56,65 ----
# Patch Apache configuration files
/usr/lib/gforge/bin/install-apache.sh configure-files
! for flavour in apache apache-perl apache-ssl ; do
! [ -e /etc/$flavour/httpd.conf ] && replace_file
/etc/$flavour/httpd.conf
! done
! replace_file /etc/php4/apache/php.ini
! replace_file /etc/php4/cgi/php.ini
# Setup our Apache
- [Gforge-commits] %s, Christian Bayle,,,, 2005/01/17
- [Gforge-commits] %s,
Christian Bayle,,, <=
- [Gforge-commits] %s, Christian Bayle,,,, 2005/01/17
- [Gforge-commits] %s, Christian Bayle,,,, 2005/01/18
- [Gforge-commits] %s, Christian Bayle,,,, 2005/01/18
- [Gforge-commits] %s, Tim Perdue,,,, 2005/01/19
- [Gforge-commits] %s, Christian Bayle,,,, 2005/01/19
- [Gforge-commits] %s, Christian Bayle,,,, 2005/01/19
- [Gforge-commits] %s, Christian Bayle,,,, 2005/01/19
- [Gforge-commits] %s, Christian Bayle,,,, 2005/01/19
- [Gforge-commits] %s, Christian Bayle,,,, 2005/01/19
- [Gforge-commits] %s, Christian Bayle,,,, 2005/01/19