[evolvis-commits] r10399: Changing replace-file config and postinst dsf-helper behaviour?==?UTF-8?Q?↵
mirabilos at evolvis.org
mirabilos at evolvis.org
Thu Feb 24 17:44:58 CET 2011
Author: mirabilos
Date: 2011-02-24 17:44:58 +0100 (Thu, 24 Feb 2011)
New Revision: 10399
Modified:
trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.postinst.dsfh-in
trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-dns-bind9.postinst.dsfh-in
trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ftp-proftpd.postinst.dsfh-in
trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ldap-openldap.postinst.dsfh-in
trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim.postinst.dsfh-in
trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim4.postinst.dsfh-in
trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-postfix.postinst.dsfh-in
trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-ldap.postinst.dsfh-in
trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-postgresql.postinst.dsfh-in
trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache.postinst.dsfh-in
Log:
Changing replace-file config and postinst dsf-helper behaviour
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog 2011-02-24 16:44:56 UTC (rev 10398)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog 2011-02-24 16:44:58 UTC (rev 10399)
@@ -1,8 +1,13 @@
-gforge (4.0.2-5) unstable; urgency=low
+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 <bayle at debian.org> Sun, 16 Jan 2005 13:34:05 +0100
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.postinst.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.postinst.dsfh-in 2011-02-24 16:44:56 UTC (rev 10398)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-db-postgresql.postinst.dsfh-in 2011-02-24 16:44:58 UTC (rev 10399)
@@ -25,7 +25,7 @@
. /usr/share/debconf/confmodule
-#NODSFHELPER:replace-files#
+#DSFHELPER:replace-files#
#DSFHELPER:handle-mainconffile#
case "$1" in
configure)
@@ -35,11 +35,8 @@
# Patch DB configuration files
/usr/lib/gforge/bin/install-db.sh configure-files
-# propose_update_install /etc/postgresql/pg_hba.conf
+ replace_file /etc/postgresql/pg_hba.conf
- # Clean debconf after ourselves
-# db_stop
-
# Setup our DB
/usr/lib/gforge/bin/install-db.sh configure
[ -f /var/lib/gforge/sf_dump_for_gforge ] && /usr/lib/gforge/bin/install-db.sh restore /var/lib/gforge/sf_dump_for_gforge && mv /var/lib/gforge/sf_dump_for_gforge /var/lib/gforge/sf_dump_for_gforge.ok && /usr/lib/gforge/bin/install-db.sh configure
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-dns-bind9.postinst.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-dns-bind9.postinst.dsfh-in 2011-02-24 16:44:56 UTC (rev 10398)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-dns-bind9.postinst.dsfh-in 2011-02-24 16:44:58 UTC (rev 10399)
@@ -25,7 +25,7 @@
. /usr/share/debconf/confmodule
-#NODSFHELPER:replace-files#
+#DSFHELPER:replace-files#
case "$1" in
configure)
# I don't know why I have to do this but somthing locks
@@ -36,11 +36,8 @@
# Patch Bind configuration files
/usr/lib/gforge/bin/install-dns.sh configure-files
-# propose_update_install /etc/bind/named.conf
+ replace_file /etc/bind/named.conf
- # Clean debconf after ourselves
-# db_stop
-
# Create the DNS zone
/usr/lib/gforge/bin/install-dns.sh configure
;;
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ftp-proftpd.postinst.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ftp-proftpd.postinst.dsfh-in 2011-02-24 16:44:56 UTC (rev 10398)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ftp-proftpd.postinst.dsfh-in 2011-02-24 16:44:58 UTC (rev 10399)
@@ -25,7 +25,7 @@
. /usr/share/debconf/confmodule
-#NODSFHELPER:replace-files#
+#DSFHELPER:replace-files#
case "$1" in
configure)
# I don't know why I have to do this but somthing locks
@@ -36,11 +36,8 @@
# Patch Proftpd configuration files
/usr/lib/gforge/bin/install-ftp.sh configure-files
-# propose_update_install /etc/proftpd.conf
+ replace_file /etc/proftpd.conf
- # Clean debconf after ourselves
-# db_stop
-
# Setup our FTP
/usr/lib/gforge/bin/install-ftp.sh configure
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ldap-openldap.postinst.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ldap-openldap.postinst.dsfh-in 2011-02-24 16:44:56 UTC (rev 10398)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-ldap-openldap.postinst.dsfh-in 2011-02-24 16:44:58 UTC (rev 10399)
@@ -25,22 +25,22 @@
. /usr/share/debconf/confmodule
-#NODSFHELPER:replace-files#
+#DSFHELPER:replace-files#
case "$1" in
configure)
+ db_stop
/usr/sbin/gforge-config
- # Patch Slapd configuration files
+ # Patch Slapd configuration files creation .gforge-new ones
/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
+ replace_file /etc/libnss-ldap.conf
+ replace_file /etc/nsswitch.conf
+ replace_file /etc/ldap/slapd.conf
- # Clean debconf after ourselves
-# db_stop
-
# 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
0)
@@ -94,6 +94,7 @@
exit $err
;;
esac
+ fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim.postinst.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim.postinst.dsfh-in 2011-02-24 16:44:56 UTC (rev 10398)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim.postinst.dsfh-in 2011-02-24 16:44:58 UTC (rev 10399)
@@ -25,19 +25,15 @@
. /usr/share/debconf/confmodule
-#NODSFHELPER:replace-files#
+#DSFHELPER:replace-files#
case "$1" in
configure)
/usr/sbin/gforge-config
# 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
-
+ replace_file /etc/aliases
+ replace_file /etc/exim/exim.conf
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim4.postinst.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim4.postinst.dsfh-in 2011-02-24 16:44:56 UTC (rev 10398)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-exim4.postinst.dsfh-in 2011-02-24 16:44:58 UTC (rev 10399)
@@ -25,21 +25,17 @@
. /usr/share/debconf/confmodule
-#NODSFHELPER:replace-files#
+#DSFHELPER:replace-files#
case "$1" in
configure)
/usr/sbin/gforge-config
# 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
-
+ 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
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-postfix.postinst.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-postfix.postinst.dsfh-in 2011-02-24 16:44:56 UTC (rev 10398)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-mta-postfix.postinst.dsfh-in 2011-02-24 16:44:58 UTC (rev 10399)
@@ -25,19 +25,15 @@
. /usr/share/debconf/confmodule
-#NODSFHELPER:replace-files#
+#DSFHELPER:replace-files#
case "$1" in
configure)
/usr/sbin/gforge-config
# 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
-
+ replace_file /etc/aliases
+ replace_file /etc/postfix/main.cf
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-ldap.postinst.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-ldap.postinst.dsfh-in 2011-02-24 16:44:56 UTC (rev 10398)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-ldap.postinst.dsfh-in 2011-02-24 16:44:58 UTC (rev 10399)
@@ -25,20 +25,17 @@
. /usr/share/debconf/confmodule
-#NODSFHELPER:replace-files#
+#DSFHELPER: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
+ replace_file /etc/libnss-ldap.conf
+ replace_file /etc/nsswitch.conf
+ replace_file /etc/ldap/slapd.conf
- # Clean debconf after ourselves
-# db_stop
-
# Install the chroot environment
/usr/lib/gforge/bin/install-chroot.sh configure
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-postgresql.postinst.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-postgresql.postinst.dsfh-in 2011-02-24 16:44:56 UTC (rev 10398)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-shell-postgresql.postinst.dsfh-in 2011-02-24 16:44:58 UTC (rev 10399)
@@ -25,19 +25,16 @@
. /usr/share/debconf/confmodule
-#NODSFHELPER:replace-files#
+#DSFHELPER:replace-files#
case "$1" in
configure)
/usr/sbin/gforge-config
# 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
+ replace_file /etc/nss-pgsql.conf
+ replace_file /etc/nsswitch.conf
- # Clean debconf after ourselves
-# db_stop
-
# Install the chroot environment
/usr/lib/gforge/bin/install-chroot.sh configure
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache.postinst.dsfh-in
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache.postinst.dsfh-in 2011-02-24 16:44:56 UTC (rev 10398)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/gforge-web-apache.postinst.dsfh-in 2011-02-24 16:44:58 UTC (rev 10399)
@@ -25,7 +25,7 @@
. /usr/share/debconf/confmodule
-#NODSFHELPER:replace-files#
+#DSFHELPER:replace-files#
#DSFHELPER:handle-mainconffile#
case "$1" in
@@ -55,12 +55,12 @@
# 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
+ for flavour in apache apache-perl apache-ssl ; do
+ [ -e /etc/$flavour/httpd.conf ] && replace_file /etc/$flavour/httpd.conf
+ done
-# propose_update_install /etc/php4/apache/php.ini
-# propose_update_install /etc/php4/cgi/php.ini
+ replace_file /etc/php4/apache/php.ini
+ replace_file /etc/php4/cgi/php.ini
# Setup our Apache
touch /var/lib/gforge/etc/httpd.vhosts && \
More information about the evolvis-commits
mailing list