From: opensides Date: Mon, 18 Oct 2010 09:13:59 +0000 (+0000) Subject: - Added triggers X-Git-Url: https://git.tokkee.org/?p=gosa.git;a=commitdiff_plain;h=4e0fdadf1a7b81e70015dc86b1f609bacad9ec4e - Added triggers - Added changelog for 2.6.11-2 - Closes debian bug 591046, 591043 git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6@20077 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/debian/changelog b/gosa-core/debian/changelog index fee0c85fb..17f593dd9 100644 --- a/gosa-core/debian/changelog +++ b/gosa-core/debian/changelog @@ -1,5 +1,20 @@ +gosa (2.6.11-2) unstable; urgency=low + + * Corrected wrong dirs on gosa-plugin-mail + * Corrected wrong dirs on gosa-plugin-gofon + * Added missing scripts in gosa-dev package + * Added missing README.squid to gosa-plugin-squid package + * Added patch for security in using gosa hook for password + + -- Benoit Mortier Sun, 17 Oct 2010 16:00:00 +0200 + gosa (2.6.11-1) unstable; urgency=low + [ Cajus Pollmeier ] + * New upstream release + + [ Benoit Mortier ] + * Samba schema file is incompatible with Samba shipped with lenny (Closes: #582899) * package explicitly depends on preform MPM (Closes: #591043) diff --git a/gosa-core/debian/gosa-apache.conf b/gosa-core/debian/gosa-apache.conf index cd38aebf8..491030fb1 100644 --- a/gosa-core/debian/gosa-apache.conf +++ b/gosa-core/debian/gosa-apache.conf @@ -16,13 +16,13 @@ Alias /gosa /usr/share/gosa/html - - PHP_Fix_Pathinfo_Enable 1 - - Options +ExecCGI - AddHandler fcgid-script .php - FCGIWrapper /var/www/php-fcgi/php-fcgi-starter .php - include /etc/gosa/gosa.secrets - - +# +# PHP_Fix_Pathinfo_Enable 1 +# +# Options +ExecCGI +# AddHandler fcgid-script .php +# FCGIWrapper /var/www/php-fcgi/php-fcgi-starter .php +# include /etc/gosa/gosa.secrets +# +# diff --git a/gosa-core/debian/gosa-dev.install b/gosa-core/debian/gosa-dev.install index 47693d6b6..df34a7001 100644 --- a/gosa-core/debian/gosa-dev.install +++ b/gosa-core/debian/gosa-dev.install @@ -1,3 +1,5 @@ -gosa-core/update-locale /usr/bin -gosa-core/update-pdf-help /usr/bin -gosa-core/dh-make-gosa /usr/bin +gosa-core/update-locale /usr/bin +gosa-core/update-pdf-help /usr/bin +gosa-core/update-online-help /usr/bin +gosa-core/dh-make-gosa /usr/bin +gosa-core/contrib/extract-locale /usr/bin diff --git a/gosa-core/debian/gosa-plugin-addressbook.triggers b/gosa-core/debian/gosa-plugin-addressbook.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-addressbook.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-connectivity.triggers b/gosa-core/debian/gosa-plugin-connectivity.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-connectivity.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-dhcp.triggers b/gosa-core/debian/gosa-plugin-dhcp.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-dhcp.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-dns.triggers b/gosa-core/debian/gosa-plugin-dns.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-dns.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-fai.triggers b/gosa-core/debian/gosa-plugin-fai.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-fai.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-gofax.triggers b/gosa-core/debian/gosa-plugin-gofax.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-gofax.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-gofon.install b/gosa-core/debian/gosa-plugin-gofon.install index 4ca6cdf3e..968994c28 100644 --- a/gosa-core/debian/gosa-plugin-gofon.install +++ b/gosa-core/debian/gosa-plugin-gofon.install @@ -4,4 +4,4 @@ gofon/help/guide.xml /usr/share/gosa/doc/plugins/gofon gofon/locale /usr/share/gosa/locale/plugins/gofon gofon/contrib /usr/share/doc/gosa-plugin-gofon gofon/html/images /usr/share/gosa/html/plugins/gofon -gofon/etc /etc/gosa +gofon/etc/asterisk/*.conf /etc/gosa/asterisk diff --git a/gosa-core/debian/gosa-plugin-gofon.triggers b/gosa-core/debian/gosa-plugin-gofon.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-gofon.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-goto.triggers b/gosa-core/debian/gosa-plugin-goto.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-goto.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-kolab.triggers b/gosa-core/debian/gosa-plugin-kolab.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-kolab.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-ldapmanager.triggers b/gosa-core/debian/gosa-plugin-ldapmanager.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-ldapmanager.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-log.triggers b/gosa-core/debian/gosa-plugin-log.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-log.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-mail.install b/gosa-core/debian/gosa-plugin-mail.install index b95effc77..5a5cbf04c 100644 --- a/gosa-core/debian/gosa-plugin-mail.install +++ b/gosa-core/debian/gosa-plugin-mail.install @@ -5,4 +5,5 @@ mail/help/guide.xml /usr/share/gosa/doc/plugins/mail mail/locale /usr/share/gosa/locale/plugins/mail mail/contrib /usr/share/doc/gosa-plugin-mail mail/html/images /usr/share/gosa/html/plugins/mail -mail/etc/ /etc/gosa +mail/etc/*.txt /etc/gosa +mail/etc/vacation /etc/gosa diff --git a/gosa-core/debian/gosa-plugin-mail.triggers b/gosa-core/debian/gosa-plugin-mail.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-mail.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-mit-krb5.triggers b/gosa-core/debian/gosa-plugin-mit-krb5.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-mit-krb5.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-nagios.triggers b/gosa-core/debian/gosa-plugin-nagios.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-nagios.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-netatalk.triggers b/gosa-core/debian/gosa-plugin-netatalk.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-netatalk.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-opengroupware.triggers b/gosa-core/debian/gosa-plugin-opengroupware.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-opengroupware.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-openxchange.triggers b/gosa-core/debian/gosa-plugin-openxchange.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-openxchange.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-opsi.triggers b/gosa-core/debian/gosa-plugin-opsi.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-opsi.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-phpgw.triggers b/gosa-core/debian/gosa-plugin-phpgw.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-phpgw.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-phpscheduleit.triggers b/gosa-core/debian/gosa-plugin-phpscheduleit.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-phpscheduleit.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-pptp.triggers b/gosa-core/debian/gosa-plugin-pptp.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-pptp.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-pureftpd.triggers b/gosa-core/debian/gosa-plugin-pureftpd.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-pureftpd.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-rolemanagement.triggers b/gosa-core/debian/gosa-plugin-rolemanagement.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-rolemanagement.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-rsyslog.triggers b/gosa-core/debian/gosa-plugin-rsyslog.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-rsyslog.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-samba.triggers b/gosa-core/debian/gosa-plugin-samba.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-samba.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-scalix.triggers b/gosa-core/debian/gosa-plugin-scalix.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-scalix.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-squid.install b/gosa-core/debian/gosa-plugin-squid.install index 55df97235..7209f6d3e 100644 --- a/gosa-core/debian/gosa-plugin-squid.install +++ b/gosa-core/debian/gosa-plugin-squid.install @@ -2,3 +2,4 @@ squid/personal /usr/share/gosa/plugins squid/help/guide.xml /usr/share/gosa/doc/plugins/squid squid/locale /usr/share/gosa/locale/plugins/squid squid/contrib /usr/share/doc/gosa-plugin-squid +squid/README.squid /usr/share/doc/gosa-plugin-squid/contrib diff --git a/gosa-core/debian/gosa-plugin-squid.triggers b/gosa-core/debian/gosa-plugin-squid.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-squid.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-ssh.triggers b/gosa-core/debian/gosa-plugin-ssh.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-ssh.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-sudo.triggers b/gosa-core/debian/gosa-plugin-sudo.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-sudo.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-systems.triggers b/gosa-core/debian/gosa-plugin-systems.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-systems.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-uw-imap.triggers b/gosa-core/debian/gosa-plugin-uw-imap.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-uw-imap.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa-plugin-webdav.triggers b/gosa-core/debian/gosa-plugin-webdav.triggers new file mode 100644 index 000000000..9b7a5987b --- /dev/null +++ b/gosa-core/debian/gosa-plugin-webdav.triggers @@ -0,0 +1 @@ +activate update-gosa-plugins diff --git a/gosa-core/debian/gosa.postinst b/gosa-core/debian/gosa.postinst index c5be14243..8aa3db73f 100644 --- a/gosa-core/debian/gosa.postinst +++ b/gosa-core/debian/gosa.postinst @@ -106,6 +106,30 @@ chmod 770 -R /var/spool/gosa chown root.$WEBGROUP -R /var/cache/gosa chmod 770 -R /var/cache/gosa -update-gosa +# Activating triggers +echo DEBUG: triggertest postinst called, $# args: "$@" + +if [ "$1" = "configure" ]; then + # in the general case, update-foo and update-bar should always be called + # when the central package is updated + update-gosa + +elif [ "$1" = "triggered" ]; then + # since the example ships two triggers, we should determine how to act + # based on which trigger was activated. + for triggername in $2; do + echo DEBUG: processing trigger "'$triggername'" + case "$triggername" in + "/usr/share/gosa") + update-gosa + ;; + *) + echo "unhandled/unknown trigger!" + exit 1 + ;; + esac + done +fi + exit 0 diff --git a/gosa-core/debian/gosa.triggers b/gosa-core/debian/gosa.triggers index 920f3cb05..63f118fe8 100644 --- a/gosa-core/debian/gosa.triggers +++ b/gosa-core/debian/gosa.triggers @@ -1,2 +1,2 @@ -interest update-gosa -interest /usr/share/gosa/plugins +interest /usr/share/gosa/ +interest update-gosa-plugins