diff --git a/net/postfix/Makefile b/mail/postfix/Makefile similarity index 87% rename from net/postfix/Makefile rename to mail/postfix/Makefile index d86da052c..fb4cdc37b 100644 --- a/net/postfix/Makefile +++ b/mail/postfix/Makefile @@ -3,6 +3,6 @@ PLUGIN_VERSION= 0.1 PLUGIN_COMMENT= SMTP mail relay PLUGIN_DEPENDS= postfix-sasl PLUGIN_MAINTAINER= m.muenz@gmail.com -PLUGIN_DEVEL= YES +PLUGIN_DEVEL= yes .include "../../Mk/plugins.mk" diff --git a/net/postfix/pkg-descr b/mail/postfix/pkg-descr similarity index 100% rename from net/postfix/pkg-descr rename to mail/postfix/pkg-descr diff --git a/net/postfix/src/etc/inc/plugins.inc.d/postfix.inc b/mail/postfix/src/etc/inc/plugins.inc.d/postfix.inc similarity index 100% rename from net/postfix/src/etc/inc/plugins.inc.d/postfix.inc rename to mail/postfix/src/etc/inc/plugins.inc.d/postfix.inc diff --git a/net/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/AntispamController.php b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/AntispamController.php similarity index 100% rename from net/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/AntispamController.php rename to mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/AntispamController.php diff --git a/net/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/DomainController.php b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/DomainController.php similarity index 100% rename from net/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/DomainController.php rename to mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/DomainController.php diff --git a/net/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/GeneralController.php b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/GeneralController.php similarity index 100% rename from net/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/GeneralController.php rename to mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/GeneralController.php diff --git a/net/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/ServiceController.php b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/ServiceController.php similarity index 100% rename from net/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/ServiceController.php rename to mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/Api/ServiceController.php diff --git a/net/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/DomainController.php b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/DomainController.php similarity index 100% rename from net/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/DomainController.php rename to mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/DomainController.php diff --git a/net/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/GeneralController.php b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/GeneralController.php similarity index 100% rename from net/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/GeneralController.php rename to mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/GeneralController.php diff --git a/net/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/antispam.xml b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/antispam.xml similarity index 100% rename from net/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/antispam.xml rename to mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/antispam.xml diff --git a/net/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/dialogEditPostfixDomain.xml b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/dialogEditPostfixDomain.xml similarity index 100% rename from net/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/dialogEditPostfixDomain.xml rename to mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/dialogEditPostfixDomain.xml diff --git a/net/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/general.xml b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/general.xml similarity index 100% rename from net/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/general.xml rename to mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/general.xml diff --git a/net/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/ACL/ACL.xml b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/ACL/ACL.xml similarity index 100% rename from net/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/ACL/ACL.xml rename to mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/ACL/ACL.xml diff --git a/net/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Antispam.php b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Antispam.php similarity index 100% rename from net/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Antispam.php rename to mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Antispam.php diff --git a/net/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Antispam.xml b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Antispam.xml similarity index 100% rename from net/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Antispam.xml rename to mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Antispam.xml diff --git a/net/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Domain.php b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Domain.php similarity index 100% rename from net/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Domain.php rename to mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Domain.php diff --git a/net/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Domain.xml b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Domain.xml similarity index 100% rename from net/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Domain.xml rename to mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Domain.xml diff --git a/net/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/General.php b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/General.php similarity index 100% rename from net/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/General.php rename to mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/General.php diff --git a/net/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/General.xml b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/General.xml similarity index 100% rename from net/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/General.xml rename to mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/General.xml diff --git a/net/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Menu/Menu.xml b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Menu/Menu.xml similarity index 100% rename from net/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Menu/Menu.xml rename to mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/Menu/Menu.xml diff --git a/net/postfix/src/opnsense/mvc/app/views/OPNsense/Postfix/domain.volt b/mail/postfix/src/opnsense/mvc/app/views/OPNsense/Postfix/domain.volt similarity index 100% rename from net/postfix/src/opnsense/mvc/app/views/OPNsense/Postfix/domain.volt rename to mail/postfix/src/opnsense/mvc/app/views/OPNsense/Postfix/domain.volt diff --git a/net/postfix/src/opnsense/mvc/app/views/OPNsense/Postfix/general.volt b/mail/postfix/src/opnsense/mvc/app/views/OPNsense/Postfix/general.volt similarity index 100% rename from net/postfix/src/opnsense/mvc/app/views/OPNsense/Postfix/general.volt rename to mail/postfix/src/opnsense/mvc/app/views/OPNsense/Postfix/general.volt diff --git a/net/postfix/src/opnsense/scripts/OPNsense/Postfix/setup.sh b/mail/postfix/src/opnsense/scripts/OPNsense/Postfix/setup.sh old mode 100644 new mode 100755 similarity index 93% rename from net/postfix/src/opnsense/scripts/OPNsense/Postfix/setup.sh rename to mail/postfix/src/opnsense/scripts/OPNsense/Postfix/setup.sh index 09a32313b..83d3bf83f --- a/net/postfix/src/opnsense/scripts/OPNsense/Postfix/setup.sh +++ b/mail/postfix/src/opnsense/scripts/OPNsense/Postfix/setup.sh @@ -1,8 +1,8 @@ #!/bin/sh mkdir -p /var/spool/postfix/ -chown root:wheel /var/spool/postfix -chmod 755 /var/spool/postfix +chown root:wheel /var/spool/postfix +chmod 755 /var/spool/postfix # Set defaults POSTFIX_DIRS="/var/spool/postfix/active /var/spool/postfix/bounce /var/spool/postfix/corrupt /var/spool/postfix/defer /var/spool/postfix/deferred /var/spool/postfix/flush /var/spool/postfix/hold /var/spool/postfix/incoming /var/spool/postfix/private /var/spool/postfix/saved /var/spool/postfix/trace /var/db/postfix" diff --git a/net/postfix/src/opnsense/service/conf/actions.d/actions_postfix.conf b/mail/postfix/src/opnsense/service/conf/actions.d/actions_postfix.conf similarity index 95% rename from net/postfix/src/opnsense/service/conf/actions.d/actions_postfix.conf rename to mail/postfix/src/opnsense/service/conf/actions.d/actions_postfix.conf index 29449e264..f26c0d74e 100644 --- a/net/postfix/src/opnsense/service/conf/actions.d/actions_postfix.conf +++ b/mail/postfix/src/opnsense/service/conf/actions.d/actions_postfix.conf @@ -32,4 +32,4 @@ message:request Postfix status command:postmap /usr/local/etc/postfix/transport parameters: type:script_output -message:rebuilding Transporttable \ No newline at end of file +message:rebuilding transport table diff --git a/net/postfix/src/opnsense/service/templates/OPNsense/Postfix/+TARGETS b/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/+TARGETS similarity index 100% rename from net/postfix/src/opnsense/service/templates/OPNsense/Postfix/+TARGETS rename to mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/+TARGETS diff --git a/net/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf b/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf similarity index 100% rename from net/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf rename to mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf diff --git a/net/postfix/src/opnsense/service/templates/OPNsense/Postfix/master.cf b/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/master.cf similarity index 100% rename from net/postfix/src/opnsense/service/templates/OPNsense/Postfix/master.cf rename to mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/master.cf diff --git a/net/postfix/src/opnsense/service/templates/OPNsense/Postfix/postfix b/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/postfix similarity index 100% rename from net/postfix/src/opnsense/service/templates/OPNsense/Postfix/postfix rename to mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/postfix diff --git a/net/postfix/src/opnsense/service/templates/OPNsense/Postfix/transport b/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/transport similarity index 100% rename from net/postfix/src/opnsense/service/templates/OPNsense/Postfix/transport rename to mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/transport