From 7177cf277e2930f52d6e37fb0739a970eaba9c8d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Fri, 5 Jan 2007 00:02:09 +0000 Subject: [PATCH] * send welcome mail on first debian package installation. --- citadel/Makefile.in | 2 +- citadel/debian/changelog | 7 +++++++ citadel/debian/citadel-server.install | 2 ++ citadel/debian/citadel-server.postinst | 18 +++++++++++++++++- citadel/debian/rules | 10 ++++++++-- citadel/sendwelcomemail.sh | 4 ++-- 6 files changed, 37 insertions(+), 6 deletions(-) diff --git a/citadel/Makefile.in b/citadel/Makefile.in index f90cb38c3..66148adaa 100644 --- a/citadel/Makefile.in +++ b/citadel/Makefile.in @@ -281,7 +281,7 @@ install-exec: all $(INSTALL) $$i $(DESTDIR)$(prefix)/$$i; \ fi \ done - @for i in utilsmenu database_cleanup.sh citadel-openldap.schema ; do \ + @for i in utilsmenu database_cleanup.sh citadel-openldap.schema; do \ if test -f $(srcdir)/$$i; then \ echo $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(prefix)/$$i; \ $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(prefix)/$$i; \ diff --git a/citadel/debian/changelog b/citadel/debian/changelog index 94c20288e..bdf93116e 100644 --- a/citadel/debian/changelog +++ b/citadel/debian/changelog @@ -1,3 +1,10 @@ +citadel (7.03-1) unstable; urgency=low + + * update to actual Citadel SVN. many new features. see Packages changelog. + + -- Wilfried Goesgens Fri, 05 Jan 2007 00:12:00 +0100 + + citadel (7.02-2) unstable; urgency=low * Initial Debian release diff --git a/citadel/debian/citadel-server.install b/citadel/debian/citadel-server.install index 84438bf23..862eb1d3e 100644 --- a/citadel/debian/citadel-server.install +++ b/citadel/debian/citadel-server.install @@ -12,3 +12,5 @@ usr/sbin/msgform usr/sbin/sendcommand usr/sbin/userlist usr/share/doc/citadel-server/database_cleanup.sh +usr/share/doc/citadel-server/welcomemail.txt +usr/share/doc/citadel-server/welcomemail.html diff --git a/citadel/debian/citadel-server.postinst b/citadel/debian/citadel-server.postinst index d01f2b88f..7498eb6fe 100644 --- a/citadel/debian/citadel-server.postinst +++ b/citadel/debian/citadel-server.postinst @@ -1,6 +1,5 @@ #!/bin/sh # postinst script for citadel-server - set -e # source debconf stuff @@ -49,6 +48,23 @@ case "$1" in echo "applying your settings." /usr/lib/citadel-server/setup -q +# we're in a fresh install, so we send the welcome message. + if test -z "$2"; then + export SEPERATOR=2600908b3f21ae7f692b973ed26e212d + export WELCOMEHTML=/usr/share/doc/citadel-server/welcomemail.html + export WELCOMETXT=/usr/share/doc/citadel-server/welcomemail.txt + export FROM=room_citadel_stats@uncensored.citadel.org + export TO=room_lobby + ( + printf "MIME-Version: 1.0\r\nContent-Type: multipart/alternative; \r\n boundary=$SEPERATOR\r\n\r\nThis is a multi-part message in MIME format.\r\n\r\n--$SEPERATOR\r\nContent-Type: text/plain; charset=utf-8\r\nContent-Transfer-Encoding: quoted-printable\r\n\r\n"; + cat $WELCOMETXT + printf "\r\n\r\n--$SEPERATOR\r\nContent-Type: text/html; charset=US-ASCII\r\nContent-Transfer-Encoding: quoted-printable\r\n\r\n" + cat $WELCOMEHTML; + printf "\r\n\r\n--$SEPERATOR--\r\n\r\n") | \ + /usr/sbin/citmail -bm -r "$FROM" "$TO" + fi + + if test -S /var/run/citadel/citadel.socket; then /usr/sbin/sendcommand "DOWN" fi diff --git a/citadel/debian/rules b/citadel/debian/rules index 48711d653..ef1bb638d 100755 --- a/citadel/debian/rules +++ b/citadel/debian/rules @@ -52,7 +52,7 @@ build-indep-stamp: configure-stamp clean: dh_testdir dh_testroot - rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP# + rm -f build-arch-stamp build-indep-stamp configure-stamp -$(MAKE) distclean @@ -75,7 +75,10 @@ install-arch: dh_clean -k -s dh_installdirs -s - $(MAKE) DESTDIR=$(DEB_DESTDIR) install-exec-new install-data-new + $(MAKE) DESTDIR=$(DEB_DESTDIR) \ + install-exec-new \ + install-data-new \ + install-doc-new mkdir -p $(DEB_DESTDIR)/usr/lib/citadel-server mv $(DEB_DESTDIR)/usr/sbin/setup \ @@ -84,6 +87,9 @@ install-arch: mkdir -p $(DEB_DESTDIR)/usr/share/doc/citadel-server/ mv $(DEB_DESTDIR)/usr/share/doc/citadel-doc/database_cleanup.sh \ $(DEB_DESTDIR)/usr/share/doc/citadel-server/ + mv $(DEB_DESTDIR)/usr/share/doc/citadel-doc/docs/welcomemail.txt \ + $(DEB_DESTDIR)/usr/share/doc/citadel-doc/docs/welcomemail.html \ + $(DEB_DESTDIR)/usr/share/doc/citadel-server/ dh_install -s --sourcedir=debian/tmp diff --git a/citadel/sendwelcomemail.sh b/citadel/sendwelcomemail.sh index 74ceb4af7..f1ac8c178 100644 --- a/citadel/sendwelcomemail.sh +++ b/citadel/sendwelcomemail.sh @@ -2,8 +2,8 @@ export FOO=2600908b3f21ae7f692b973ed26e212d -export WELCOMEHTML=docs/welcomemail.html -export WELCOMETXT=docs/welcomemail.txt +export WELCOMEHTML=welcomemail.html +export WELCOMETXT=welcomemail.txt export FROM=room_citadel_stats@uncensored.citadel.org export TO=room_lobby ( -- 2.30.2