dma: move config files to source directory

diff --git a/etc/Makefile b/etc/Makefile
index 98fe49d..041ee48 100644 (file)
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -49,6 +49,7 @@ DIRS+=        secure/lib/libssh \
 .endif
 DIRS+= secure/usr.bin/openssl
 .endif
+DIRS+= libexec/dma
 
 # Files that should be installed read-only-executable (555) root:wheel
 #
@@ -259,7 +260,6 @@ distribution:
            ${DEFAULTS} ${DESTDIR}/etc/defaults
        cd ${.CURDIR}/pam.d; ${MAKE} install
        cd ${.CURDIR}/bluetooth; ${MAKE} install
-       cd ${.CURDIR}/dma; ${MAKE} install
        cd ${.CURDIR}/periodic; ${MAKE} install
        cd ${.CURDIR}/rc.d; ${MAKE} install 
        cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap

diff --git a/etc/dma/Makefile b/libexec/dma/Makefile.etc
similarity index 100%
rename from etc/dma/Makefile
rename to libexec/dma/Makefile.etc

diff --git a/etc/dma/auth.conf b/libexec/dma/auth.conf
similarity index 100%
rename from etc/dma/auth.conf
rename to libexec/dma/auth.conf

diff --git a/etc/dma/dma.conf b/libexec/dma/dma.conf
similarity index 92%
rename from etc/dma/dma.conf
rename to libexec/dma/dma.conf
index 6376a41..8fdb9a1 100644 (file)
--- a/etc/dma/dma.conf
+++ b/libexec/dma/dma.conf
@@ -5,19 +5,19 @@
 #SMARTHOST
 
 # Use this SMTP port.  Most users will be fine with the default (25)
-PORT 25
+#PORT 25
 
 # Path to your alias file.  Just stay with the default.
-ALIASES /etc/mail/aliases
+#ALIASES /etc/mail/aliases
 
 # Path to your spooldir.  Just stay with the default.
-SPOOLDIR /var/spool/dma
+#SPOOLDIR /var/spool/dma
 
 # Path to your virtual user file.  Just stay with the default.
-VIRTPATH /etc/dma/virtusertable
+#VIRTPATH /etc/dma/virtusertable
 
 # SMTP authentication
-AUTHPATH /etc/dma/auth.conf
+#AUTHPATH /etc/dma/auth.conf
 
 # Uncomment if you want address rewriting
 #VIRTUAL

diff --git a/etc/dma/virtusertable b/libexec/dma/virtusertable
similarity index 100%
rename from etc/dma/virtusertable
rename to libexec/dma/virtusertable