From 6673bb86922d419b8b563d3f0632aa3b2619500e Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sat, 11 Dec 2021 12:30:48 +0100 Subject: [PATCH] mail/fetchmail: remove --- LICENSE | 2 +- README.md | 1 - mail/fetchmail/Makefile | 7 -- mail/fetchmail/pkg-descr | 19 ---- .../src/etc/inc/plugins.inc.d/fetchmail.inc | 49 ---------- .../Fetchmail/Api/GeneralController.php | 37 -------- .../Fetchmail/Api/MailboxController.php | 67 -------------- .../Fetchmail/Api/ServiceController.php | 43 --------- .../OPNsense/Fetchmail/GeneralController.php | 38 -------- .../OPNsense/Fetchmail/MailboxController.php | 38 -------- .../forms/dialogEditFetchmailMailbox.xml | 56 ------------ .../OPNsense/Fetchmail/forms/general.xml | 14 --- .../app/models/OPNsense/Fetchmail/ACL/ACL.xml | 9 -- .../app/models/OPNsense/Fetchmail/General.php | 34 ------- .../app/models/OPNsense/Fetchmail/General.xml | 15 --- .../app/models/OPNsense/Fetchmail/Mailbox.php | 34 ------- .../app/models/OPNsense/Fetchmail/Mailbox.xml | 45 --------- .../models/OPNsense/Fetchmail/Menu/Menu.xml | 8 -- .../app/views/OPNsense/Fetchmail/general.volt | 61 ------------- .../app/views/OPNsense/Fetchmail/mailbox.volt | 91 ------------------- .../scripts/OPNsense/Fetchmail/setup.sh | 6 -- .../conf/actions.d/actions_fetchmail.conf | 24 ----- .../templates/OPNsense/Fetchmail/+TARGETS | 2 - .../templates/OPNsense/Fetchmail/fetchmail | 6 -- .../templates/OPNsense/Fetchmail/fetchmailrc | 14 --- 25 files changed, 1 insertion(+), 719 deletions(-) delete mode 100644 mail/fetchmail/Makefile delete mode 100644 mail/fetchmail/pkg-descr delete mode 100644 mail/fetchmail/src/etc/inc/plugins.inc.d/fetchmail.inc delete mode 100644 mail/fetchmail/src/opnsense/mvc/app/controllers/OPNsense/Fetchmail/Api/GeneralController.php delete mode 100644 mail/fetchmail/src/opnsense/mvc/app/controllers/OPNsense/Fetchmail/Api/MailboxController.php delete mode 100644 mail/fetchmail/src/opnsense/mvc/app/controllers/OPNsense/Fetchmail/Api/ServiceController.php delete mode 100644 mail/fetchmail/src/opnsense/mvc/app/controllers/OPNsense/Fetchmail/GeneralController.php delete mode 100644 mail/fetchmail/src/opnsense/mvc/app/controllers/OPNsense/Fetchmail/MailboxController.php delete mode 100644 mail/fetchmail/src/opnsense/mvc/app/controllers/OPNsense/Fetchmail/forms/dialogEditFetchmailMailbox.xml delete mode 100644 mail/fetchmail/src/opnsense/mvc/app/controllers/OPNsense/Fetchmail/forms/general.xml delete mode 100644 mail/fetchmail/src/opnsense/mvc/app/models/OPNsense/Fetchmail/ACL/ACL.xml delete mode 100644 mail/fetchmail/src/opnsense/mvc/app/models/OPNsense/Fetchmail/General.php delete mode 100644 mail/fetchmail/src/opnsense/mvc/app/models/OPNsense/Fetchmail/General.xml delete mode 100644 mail/fetchmail/src/opnsense/mvc/app/models/OPNsense/Fetchmail/Mailbox.php delete mode 100644 mail/fetchmail/src/opnsense/mvc/app/models/OPNsense/Fetchmail/Mailbox.xml delete mode 100644 mail/fetchmail/src/opnsense/mvc/app/models/OPNsense/Fetchmail/Menu/Menu.xml delete mode 100644 mail/fetchmail/src/opnsense/mvc/app/views/OPNsense/Fetchmail/general.volt delete mode 100644 mail/fetchmail/src/opnsense/mvc/app/views/OPNsense/Fetchmail/mailbox.volt delete mode 100755 mail/fetchmail/src/opnsense/scripts/OPNsense/Fetchmail/setup.sh delete mode 100644 mail/fetchmail/src/opnsense/service/conf/actions.d/actions_fetchmail.conf delete mode 100644 mail/fetchmail/src/opnsense/service/templates/OPNsense/Fetchmail/+TARGETS delete mode 100644 mail/fetchmail/src/opnsense/service/templates/OPNsense/Fetchmail/fetchmail delete mode 100644 mail/fetchmail/src/opnsense/service/templates/OPNsense/Fetchmail/fetchmailrc diff --git a/LICENSE b/LICENSE index 8d1a91e7e..674caff04 100644 --- a/LICENSE +++ b/LICENSE @@ -12,7 +12,7 @@ Copyright (c) 2008 Donovan Schonknecht Copyright (c) 2016-2019 EURO-LOG AG Copyright (c) 2006 Eric Friesen Copyright (c) 2008-2010 Ermal Luçi -Copyright (c) 2017-2019 Fabian Franz +Copyright (c) 2017-2020 Fabian Franz Copyright (c) 2019 Felix Matouschek Copyright (c) 2014-2021 Franco Fichtner Copyright (c) 2016-2021 Frank Wall diff --git a/README.md b/README.md index 9bc15ce24..2c9a30bb3 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,6 @@ dns/dyndns -- Dynamic DNS Support dns/rfc2136 -- RFC-2136 Support emulators/qemu-guest-agent -- QEMU Guest Agent for OPNsense ftp/tftp -- TFTP server -mail/fetchmail -- Remote-mail retrieval utility mail/postfix -- SMTP mail relay mail/rspamd -- Protect your network from spam misc/theme-cicada -- The cicada theme - dark grey diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile deleted file mode 100644 index db47f30b4..000000000 --- a/mail/fetchmail/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -PLUGIN_NAME= fetchmail -PLUGIN_VERSION= 1.1 -PLUGIN_COMMENT= Remote-mail retrieval utility -PLUGIN_DEPENDS= fetchmail -PLUGIN_MAINTAINER= m.muenz@gmail.com - -.include "../../Mk/plugins.mk" diff --git a/mail/fetchmail/pkg-descr b/mail/fetchmail/pkg-descr deleted file mode 100644 index 41d9cfd41..000000000 --- a/mail/fetchmail/pkg-descr +++ /dev/null @@ -1,19 +0,0 @@ -Fetchmail is a full-featured, robust, well-documented remote-mail retrieval and forwarding -utility intended to be used over on-demand TCP/IP links (such as SLIP or PPP connections). -It supports every remote-mail protocol now in use on the Internet: POP2, POP3, RPOP, APOP, -KPOP, all flavors of IMAP, ETRN, and ODMR. - -Plugin Changelog -================ - -1.1 - -* Fix "ssl" keyword syntax (contributed by mr44er) - -1.0 - -* Allow fetching IMAP mailboxes -* Allow fetching POP3 mailboxes - - -WWW: https://www.fetchmail.info/ diff --git a/mail/fetchmail/src/etc/inc/plugins.inc.d/fetchmail.inc b/mail/fetchmail/src/etc/inc/plugins.inc.d/fetchmail.inc deleted file mode 100644 index 1243a3e6e..000000000 --- a/mail/fetchmail/src/etc/inc/plugins.inc.d/fetchmail.inc +++ /dev/null @@ -1,49 +0,0 @@ - - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. -*/ - -function fetchmail_services() -{ - global $config; - - $services = array(); - - if (isset($config['OPNsense']['fetchmail']['general']['enabled']) && $config['OPNsense']['fetchmail']['general']['enabled'] == 1) { - $services[] = array( - 'description' => gettext('Fetchmail'), - 'configd' => array( - 'restart' => array('fetchmail restart'), - 'start' => array('fetchmail start'), - 'stop' => array('fetchmail stop'), - ), - 'name' => 'fetchmail', - 'pidfile' => '/var/run/fetchmail/fetchmail.pid' - ); - } - - return $services; -} diff --git a/mail/fetchmail/src/opnsense/mvc/app/controllers/OPNsense/Fetchmail/Api/GeneralController.php b/mail/fetchmail/src/opnsense/mvc/app/controllers/OPNsense/Fetchmail/Api/GeneralController.php deleted file mode 100644 index 3a9d3ba8f..000000000 --- a/mail/fetchmail/src/opnsense/mvc/app/controllers/OPNsense/Fetchmail/Api/GeneralController.php +++ /dev/null @@ -1,37 +0,0 @@ - - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -namespace OPNsense\Fetchmail\Api; - -use OPNsense\Base\ApiMutableModelControllerBase; - -class GeneralController extends ApiMutableModelControllerBase -{ - protected static $internalModelClass = '\OPNsense\Fetchmail\General'; - protected static $internalModelName = 'general'; -} diff --git a/mail/fetchmail/src/opnsense/mvc/app/controllers/OPNsense/Fetchmail/Api/MailboxController.php b/mail/fetchmail/src/opnsense/mvc/app/controllers/OPNsense/Fetchmail/Api/MailboxController.php deleted file mode 100644 index 403c36152..000000000 --- a/mail/fetchmail/src/opnsense/mvc/app/controllers/OPNsense/Fetchmail/Api/MailboxController.php +++ /dev/null @@ -1,67 +0,0 @@ - - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -namespace OPNsense\Fetchmail\Api; - -use OPNsense\Base\ApiMutableModelControllerBase; - -class MailboxController extends ApiMutableModelControllerBase -{ - protected static $internalModelName = 'mailbox'; - protected static $internalModelClass = '\OPNsense\Fetchmail\Mailbox'; - - public function searchMailboxAction() - { - return $this->searchBase('mailboxes.mailbox', array("enabled", "host", "protocol", "user", "password", "destinationmail", "destination")); - } - - public function getMailboxAction($uuid = null) - { - return $this->getBase('mailbox', 'mailboxes.mailbox', $uuid); - } - - public function addMailboxAction() - { - return $this->addBase('mailbox', 'mailboxes.mailbox'); - } - - public function delMailboxAction($uuid) - { - return $this->delBase('mailboxes.mailbox', $uuid); - } - - public function setMailboxAction($uuid) - { - return $this->setBase('mailbox', 'mailboxes.mailbox', $uuid); - } - - public function toggleMailboxAction($uuid) - { - return $this->toggleBase('mailboxes.mailbox', $uuid); - } -} diff --git a/mail/fetchmail/src/opnsense/mvc/app/controllers/OPNsense/Fetchmail/Api/ServiceController.php b/mail/fetchmail/src/opnsense/mvc/app/controllers/OPNsense/Fetchmail/Api/ServiceController.php deleted file mode 100644 index d3ea06f1a..000000000 --- a/mail/fetchmail/src/opnsense/mvc/app/controllers/OPNsense/Fetchmail/Api/ServiceController.php +++ /dev/null @@ -1,43 +0,0 @@ - - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -namespace OPNsense\Fetchmail\Api; - -use OPNsense\Base\ApiMutableServiceControllerBase; - -/** - * Class ServiceController - * @package OPNsense\Fetchmail - */ -class ServiceController extends ApiMutableServiceControllerBase -{ - protected static $internalServiceClass = '\OPNsense\Fetchmail\General'; - protected static $internalServiceTemplate = 'OPNsense/Fetchmail'; - protected static $internalServiceEnabled = 'enabled'; - protected static $internalServiceName = 'fetchmail'; -} diff --git a/mail/fetchmail/src/opnsense/mvc/app/controllers/OPNsense/Fetchmail/GeneralController.php b/mail/fetchmail/src/opnsense/mvc/app/controllers/OPNsense/Fetchmail/GeneralController.php deleted file mode 100644 index dde96e521..000000000 --- a/mail/fetchmail/src/opnsense/mvc/app/controllers/OPNsense/Fetchmail/GeneralController.php +++ /dev/null @@ -1,38 +0,0 @@ - - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -namespace OPNsense\Fetchmail; - -class GeneralController extends \OPNsense\Base\IndexController -{ - public function indexAction() - { - $this->view->generalForm = $this->getForm("general"); - $this->view->pick('OPNsense/Fetchmail/general'); - } -} diff --git a/mail/fetchmail/src/opnsense/mvc/app/controllers/OPNsense/Fetchmail/MailboxController.php b/mail/fetchmail/src/opnsense/mvc/app/controllers/OPNsense/Fetchmail/MailboxController.php deleted file mode 100644 index 1417158fd..000000000 --- a/mail/fetchmail/src/opnsense/mvc/app/controllers/OPNsense/Fetchmail/MailboxController.php +++ /dev/null @@ -1,38 +0,0 @@ - - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -namespace OPNsense\Fetchmail; - -class MailboxController extends \OPNsense\Base\IndexController -{ - public function indexAction() - { - $this->view->formDialogEditFetchmailMailbox = $this->getForm("dialogEditFetchmailMailbox"); - $this->view->pick('OPNsense/Fetchmail/mailbox'); - } -} diff --git a/mail/fetchmail/src/opnsense/mvc/app/controllers/OPNsense/Fetchmail/forms/dialogEditFetchmailMailbox.xml b/mail/fetchmail/src/opnsense/mvc/app/controllers/OPNsense/Fetchmail/forms/dialogEditFetchmailMailbox.xml deleted file mode 100644 index 98307b4d4..000000000 --- a/mail/fetchmail/src/opnsense/mvc/app/controllers/OPNsense/Fetchmail/forms/dialogEditFetchmailMailbox.xml +++ /dev/null @@ -1,56 +0,0 @@ -
- - mailbox.enabled - - checkbox - This will enable or disable the mailbox retrieving. - - - mailbox.host - - text - Hostname of the mail server where mailbox is located. - - - mailbox.protocol - - dropdown - Choose the protocol to use. - - - mailbox.user - - text - Username to authenticate against remote mail server. - - - mailbox.password - - text - Password to authenticate against remote mail server. - - - mailbox.destinationmail - - text - Set the mail address to deliver fetched mails to. - - - mailbox.destination - - text - Set the mail server hostname or IP to deliver fetched mails to. - - - mailbox.usessl - - checkbox - This will enable or disable usage of encrypted connections. For IMAP and POP3 it will switch the ports to 993 and 995. - - - mailbox.sslfingerprint - - text - If the server is using a self-signed certificate, the only option fetching mails is to enter the certficiate fingerprint here. - -
diff --git a/mail/fetchmail/src/opnsense/mvc/app/controllers/OPNsense/Fetchmail/forms/general.xml b/mail/fetchmail/src/opnsense/mvc/app/controllers/OPNsense/Fetchmail/forms/general.xml deleted file mode 100644 index ac0248189..000000000 --- a/mail/fetchmail/src/opnsense/mvc/app/controllers/OPNsense/Fetchmail/forms/general.xml +++ /dev/null @@ -1,14 +0,0 @@ -
- - general.enabled - - checkbox - This will activate the Fetchmail daemon. - - - general.interval - - text - Interval in seconds how often to retrieve mails. - -
diff --git a/mail/fetchmail/src/opnsense/mvc/app/models/OPNsense/Fetchmail/ACL/ACL.xml b/mail/fetchmail/src/opnsense/mvc/app/models/OPNsense/Fetchmail/ACL/ACL.xml deleted file mode 100644 index e3727a40a..000000000 --- a/mail/fetchmail/src/opnsense/mvc/app/models/OPNsense/Fetchmail/ACL/ACL.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Services: Fetchmail - - ui/fetchmail/* - api/fetchmail/* - - - diff --git a/mail/fetchmail/src/opnsense/mvc/app/models/OPNsense/Fetchmail/General.php b/mail/fetchmail/src/opnsense/mvc/app/models/OPNsense/Fetchmail/General.php deleted file mode 100644 index 5ec3f1dd2..000000000 --- a/mail/fetchmail/src/opnsense/mvc/app/models/OPNsense/Fetchmail/General.php +++ /dev/null @@ -1,34 +0,0 @@ - - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - *ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -namespace OPNsense\Fetchmail; - -use OPNsense\Base\BaseModel; - -class General extends BaseModel -{ -} diff --git a/mail/fetchmail/src/opnsense/mvc/app/models/OPNsense/Fetchmail/General.xml b/mail/fetchmail/src/opnsense/mvc/app/models/OPNsense/Fetchmail/General.xml deleted file mode 100644 index 09cb296c5..000000000 --- a/mail/fetchmail/src/opnsense/mvc/app/models/OPNsense/Fetchmail/General.xml +++ /dev/null @@ -1,15 +0,0 @@ - - //OPNsense/fetchmail/general - Fetchmail configuration - 0.1 - - - 0 - Y - - - 600 - Y - - - diff --git a/mail/fetchmail/src/opnsense/mvc/app/models/OPNsense/Fetchmail/Mailbox.php b/mail/fetchmail/src/opnsense/mvc/app/models/OPNsense/Fetchmail/Mailbox.php deleted file mode 100644 index e843ede94..000000000 --- a/mail/fetchmail/src/opnsense/mvc/app/models/OPNsense/Fetchmail/Mailbox.php +++ /dev/null @@ -1,34 +0,0 @@ - - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - *ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -namespace OPNsense\Fetchmail; - -use OPNsense\Base\BaseModel; - -class Mailbox extends BaseModel -{ -} diff --git a/mail/fetchmail/src/opnsense/mvc/app/models/OPNsense/Fetchmail/Mailbox.xml b/mail/fetchmail/src/opnsense/mvc/app/models/OPNsense/Fetchmail/Mailbox.xml deleted file mode 100644 index adc2e8a4f..000000000 --- a/mail/fetchmail/src/opnsense/mvc/app/models/OPNsense/Fetchmail/Mailbox.xml +++ /dev/null @@ -1,45 +0,0 @@ - - //OPNsense/fetchmail/mailbox - Fetchmail configuration - 0.1 - - - - - 1 - Y - - - Y - - - Y - - POP3 - IMAP - - - - Y - - - Y - - - Y - - - Y - - - 1 - Y - - - N - /^[A-Fa-f0-9\:]$/ - - - - - diff --git a/mail/fetchmail/src/opnsense/mvc/app/models/OPNsense/Fetchmail/Menu/Menu.xml b/mail/fetchmail/src/opnsense/mvc/app/models/OPNsense/Fetchmail/Menu/Menu.xml deleted file mode 100644 index 59c8854d8..000000000 --- a/mail/fetchmail/src/opnsense/mvc/app/models/OPNsense/Fetchmail/Menu/Menu.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/mail/fetchmail/src/opnsense/mvc/app/views/OPNsense/Fetchmail/general.volt b/mail/fetchmail/src/opnsense/mvc/app/views/OPNsense/Fetchmail/general.volt deleted file mode 100644 index 77f259c4c..000000000 --- a/mail/fetchmail/src/opnsense/mvc/app/views/OPNsense/Fetchmail/general.volt +++ /dev/null @@ -1,61 +0,0 @@ -{# - # - # Copyright (C) 2020 Michael Muenz - # All rights reserved. - # - # Redistribution and use in source and binary forms, with or without modification, - # are permitted provided that the following conditions are met: - # - # 1. Redistributions of source code must retain the above copyright notice, - # this list of conditions and the following disclaimer. - # - # 2. Redistributions in binary form must reproduce the above copyright notice, - # this list of conditions and the following disclaimer in the documentation - # and/or other materials provided with the distribution. - # - # THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, - # INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - # AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - # AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - # OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - # POSSIBILITY OF SUCH DAMAGE. - #} -
-
-
- {{ partial("layout_partials/base_form",['fields':generalForm,'id':'frm_general_settings'])}} -
-
- -
-
-
-
- - diff --git a/mail/fetchmail/src/opnsense/mvc/app/views/OPNsense/Fetchmail/mailbox.volt b/mail/fetchmail/src/opnsense/mvc/app/views/OPNsense/Fetchmail/mailbox.volt deleted file mode 100644 index 3be00f23d..000000000 --- a/mail/fetchmail/src/opnsense/mvc/app/views/OPNsense/Fetchmail/mailbox.volt +++ /dev/null @@ -1,91 +0,0 @@ -{# - # - # Copyright (C) 2020 Michael Muenz - # All rights reserved. - # - # Redistribution and use in source and binary forms, with or without modification, - # are permitted provided that the following conditions are met: - # - # 1. Redistributions of source code must retain the above copyright notice, - # this list of conditions and the following disclaimer. - # - # 2. Redistributions in binary form must reproduce the above copyright notice, - # this list of conditions and the following disclaimer in the documentation - # and/or other materials provided with the distribution. - # - # THIS SOFTWARE IS PROVIDED “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, - # INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - # AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - # AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - # OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - # POSSIBILITY OF SUCH DAMAGE. - #} -
-
- - - - - - - - - - - - - - - - - - - - - -
{{ lang._('Enabled') }}{{ lang._('Host') }}{{ lang._('Protocol') }}{{ lang._('Username') }}{{ lang._('Password') }}{{ lang._('Destination') }}{{ lang._('ID') }}{{ lang._('Commands') }}
- - -
-
-
- -

-
-
-
- -{{ partial("layout_partials/base_dialog",['fields':formDialogEditFetchmailMailbox,'id':'dialogEditFetchmailMailbox','label':lang._('Edit Mailbox')])}} - - diff --git a/mail/fetchmail/src/opnsense/scripts/OPNsense/Fetchmail/setup.sh b/mail/fetchmail/src/opnsense/scripts/OPNsense/Fetchmail/setup.sh deleted file mode 100755 index feda292bc..000000000 --- a/mail/fetchmail/src/opnsense/scripts/OPNsense/Fetchmail/setup.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -mkdir -p /var/run/fetchmail -chown fetchmail:wheel /var/run/fetchmail -chmod 755 /var/run/fetchmail -chmod 700 /usr/local/etc/fetchmailrc diff --git a/mail/fetchmail/src/opnsense/service/conf/actions.d/actions_fetchmail.conf b/mail/fetchmail/src/opnsense/service/conf/actions.d/actions_fetchmail.conf deleted file mode 100644 index 9c38206db..000000000 --- a/mail/fetchmail/src/opnsense/service/conf/actions.d/actions_fetchmail.conf +++ /dev/null @@ -1,24 +0,0 @@ -[start] -command:/usr/local/opnsense/scripts/OPNsense/Fetchmail/setup.sh;/usr/local/etc/rc.d/fetchmail start -parameters: -type:script -message:starting Fetchmail - -[stop] -command:/usr/local/etc/rc.d/fetchmail stop; exit 0 -parameters: -type:script -message:stopping Fetchmail - -[restart] -command:/usr/local/opnsense/scripts/OPNsense/Fetchmail/setup.sh;/usr/local/etc/rc.d/fetchmail restart -parameters: -type:script -message:restarting Fetchmail -description:Restart Fetchmail service - -[status] -command:/usr/local/etc/rc.d/fetchmail status;exit 0 -parameters: -type:script_output -message:request Fetchmail status diff --git a/mail/fetchmail/src/opnsense/service/templates/OPNsense/Fetchmail/+TARGETS b/mail/fetchmail/src/opnsense/service/templates/OPNsense/Fetchmail/+TARGETS deleted file mode 100644 index 014ce2e15..000000000 --- a/mail/fetchmail/src/opnsense/service/templates/OPNsense/Fetchmail/+TARGETS +++ /dev/null @@ -1,2 +0,0 @@ -fetchmailrc:/usr/local/etc/fetchmailrc -fetchmail:/etc/rc.conf.d/fetchmail diff --git a/mail/fetchmail/src/opnsense/service/templates/OPNsense/Fetchmail/fetchmail b/mail/fetchmail/src/opnsense/service/templates/OPNsense/Fetchmail/fetchmail deleted file mode 100644 index 4a21f3d9c..000000000 --- a/mail/fetchmail/src/opnsense/service/templates/OPNsense/Fetchmail/fetchmail +++ /dev/null @@ -1,6 +0,0 @@ -{% if helpers.exists('OPNsense.fetchmail.general.enabled') and OPNsense.fetchmail.general.enabled == '1' %} -fetchmail_var_script="/usr/local/opnsense/scripts/OPNsense/Fetchmail/setup.sh" -fetchmail_enable="YES" -{% else %} -fetchmail_enable="NO" -{% endif %} diff --git a/mail/fetchmail/src/opnsense/service/templates/OPNsense/Fetchmail/fetchmailrc b/mail/fetchmail/src/opnsense/service/templates/OPNsense/Fetchmail/fetchmailrc deleted file mode 100644 index 891cf3772..000000000 --- a/mail/fetchmail/src/opnsense/service/templates/OPNsense/Fetchmail/fetchmailrc +++ /dev/null @@ -1,14 +0,0 @@ -{% if helpers.exists('OPNsense.fetchmail.general.enabled') and OPNsense.fetchmail.general.enabled == '1' %} - -set daemon {{ OPNsense.fetchmail.general.interval }} -set syslog - -{% if helpers.exists('OPNsense.fetchmail.mailbox.mailboxes.mailbox') %} -{% for mailbox_list in helpers.toList('OPNsense.fetchmail.mailbox.mailboxes.mailbox') %} -{% if mailbox_list.enabled == '1' %} -poll {{ mailbox_list.host }} protocol {{ mailbox_list.protocol }} username "{{ mailbox_list.user }}" password "{{ mailbox_list.password }}" is {{ mailbox_list.destinationmail }} smtphost {{ mailbox_list.destination }} {% if mailbox_list.usessl == "0" %}ssl {% endif %} {% if mailbox_list.sslfingerprint|default('') != '' %} sslfingerprint "{{ mailbox_list.sslfingerprint }}" {% endif %} -{% endif %} -{% endfor %} -{% endif %} - -{% endif %}