From 7a9cbe8ff7fa045782eef3844ae5cfc695e56537 Mon Sep 17 00:00:00 2001 From: votdev Date: Sun, 25 Sep 2016 15:02:34 +0200 Subject: [PATCH] Fix Zeroconf issue. This is not done via avahi manually, instead the netatalk daemon will take about this itself. --- deb/openmediavault-netatalk/debian/changelog | 1 + .../debian/openmediavault-netatalk.postinst | 4 +++ .../debian/openmediavault-netatalk.postrm | 2 -- .../openmediavault/engined/module/afp.inc | 33 +------------------ 4 files changed, 6 insertions(+), 34 deletions(-) diff --git a/deb/openmediavault-netatalk/debian/changelog b/deb/openmediavault-netatalk/debian/changelog index 6b902916603..78ad68c2ebb 100755 --- a/deb/openmediavault-netatalk/debian/changelog +++ b/deb/openmediavault-netatalk/debian/changelog @@ -1,6 +1,7 @@ openmediavault-netatalk (3.2.2) stable; urgency=low * Harden installation script. + * Fix Zeroconf issue. -- Volker Theile Sun, 25 Sep 2016 12:39:53 +0200 diff --git a/deb/openmediavault-netatalk/debian/openmediavault-netatalk.postinst b/deb/openmediavault-netatalk/debian/openmediavault-netatalk.postinst index 3e5c90b66a6..5b747cc9766 100755 --- a/deb/openmediavault-netatalk/debian/openmediavault-netatalk.postinst +++ b/deb/openmediavault-netatalk/debian/openmediavault-netatalk.postinst @@ -118,6 +118,10 @@ case "$1" in omv_config_delete "/config/services/afp/shares/share/options/usedots" omv_config_delete "/config/services/afp/shares/share/options/mswindows" fi + if dpkg --compare-versions "$2" lt-nl "3.2.2"; then + # Zeroconf is now handled by the netatalk daemon itself. + omv_config_delete "/config/services/zeroconf/services/service[id='afp']" + fi ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/deb/openmediavault-netatalk/debian/openmediavault-netatalk.postrm b/deb/openmediavault-netatalk/debian/openmediavault-netatalk.postrm index f6f7e6e7020..59dc5edd3ef 100755 --- a/deb/openmediavault-netatalk/debian/openmediavault-netatalk.postrm +++ b/deb/openmediavault-netatalk/debian/openmediavault-netatalk.postrm @@ -34,8 +34,6 @@ case "$1" in purge) # Remove the configuration data. omv_config_delete "/config/services/afp" - # Remove Zeroconf configuration. - omv_config_delete "/config/services/zeroconf/services/service[id='afp']" ;; remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) diff --git a/deb/openmediavault-netatalk/usr/share/openmediavault/engined/module/afp.inc b/deb/openmediavault-netatalk/usr/share/openmediavault/engined/module/afp.inc index aac4bb0efba..fc06eeea7ca 100755 --- a/deb/openmediavault-netatalk/usr/share/openmediavault/engined/module/afp.inc +++ b/deb/openmediavault-netatalk/usr/share/openmediavault/engined/module/afp.inc @@ -20,8 +20,7 @@ * along with OpenMediaVault. If not, see . */ class OMVModuleAFP extends \OMV\Engine\Module\ServiceAbstract implements - \OMV\Engine\Notify\IListener, \OMV\Engine\Module\IServiceStatus, - \OMV\Engine\Module\IZeroconf { + \OMV\Engine\Notify\IListener, \OMV\Engine\Module\IServiceStatus { private $invalidUsers = [ "admin" ]; /** @@ -99,32 +98,6 @@ class OMVModuleAFP extends \OMV\Engine\Module\ServiceAbstract implements ]; } - /** - * Get the Zeroconf service configuration. - */ - public function getZeroconfConfig() { - return [ - "id" => "afp", - "title" => gettext("Apple Filing") - ]; - } - - /** - * Helper function that is called whenever a share is created, modified - * or deleted. - * @param type The event message type. - * @param path The event message path. - * @param object The configuration object. - */ - final public function onShare($type, $path, $object) { - // Set this module to dirty. - $this->setDirty(); - // If this share is used for time machine then set the 'zeroconf' - // module to dirty to update the Zeroconf/Bonjour configuration. - if (array_boolval($object['options'], "tm")) - $this->setDirtyByName("zeroconf"); - } - /** * Helper function to find out whether the given shared folder * configuration object is used. If it is used, then mark the @@ -152,10 +125,6 @@ class OMVModuleAFP extends \OMV\Engine\Module\ServiceAbstract implements OMV_NOTIFY_MODIFY, "org.openmediavault.conf.service.afp", [ $this, "setDirty" ]); - $dispatcher->addListener( - OMV_NOTIFY_CREATE | OMV_NOTIFY_MODIFY | OMV_NOTIFY_DELETE, - "org.openmediavault.conf.service.afp.share", - [ $this, "onShare" ]); $dispatcher->addListener( OMV_NOTIFY_MODIFY, "org.openmediavault.conf.system.sharedfolder",