Adding configuration file to rpm

diff --git a/Makefile b/Makefile
index 0cd31477010e14b5d3291f747c576c528cd12d74..293ae12553db97b04dc42e22f3efa2a13853e770 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -222,7 +222,11 @@ install    :
                $(DESTDIR)/$(EXECDIR)/$(APPN)
           @ cp -a                                      \
                conf/$(APPN).conf                       \
+               conf/relayed.conf                       \
+               conf/blacklister.conf                   \
                $(DESTDIR)/$(ETCDIR)/$(APPN)
+          @ echo JMPDBG
+          @ ls -ails $(DESTDIR)/$(ETCDIR)/$(APPN)
           @ cp -a                                      \
                conf/dovecot                            \
                $(DESTDIR)/$(ETCDIR)/$(APPN)/

diff --git a/conf/relayed.conf b/conf/relayed.conf
index 5c217dcf2c6f3723fea307db72ddb74ca1fb0aa9..114af5824518a1bcc86781b260195dd76f8f627c 100644 (file)
--- a/conf/relayed.conf
+++ b/conf/relayed.conf
@@ -1,6 +1,5 @@
 #--------------------------------------------------------
 ##Private address block which email can be relayed from
 127.0.0.0/8                    #local loop number
-192.168.254.0/24               #local network
 #--------------------------------------------------------
 #Setup you own list

diff --git a/conf/relayed.conf.dvl b/conf/relayed.conf.dvl
new file mode 100644 (file)
index 0000000..5c217dc
--- /dev/null
+++ b/conf/relayed.conf.dvl
@@ -0,0 +1,6 @@
+#--------------------------------------------------------
+##Private address block which email can be relayed from
+127.0.0.0/8                    #local loop number
+192.168.254.0/24               #local network
+#--------------------------------------------------------
+#Setup you own list

diff --git a/mailleur.spec.in b/mailleur.spec.in
index c1046a115408d000941f6b6f5806763ad82b9413..ed6a921d4dac88bb0f3a91acf4e08a84880aa624 100644 (file)
--- a/mailleur.spec.in
+++ b/mailleur.spec.in
@@ -41,7 +41,11 @@ search about email exchange within time and transaction context.
 %attr(0754,root,root) %{_datadir}/%{name}/linux/osukiss/sorter
 %attr(0644,%{name},mail) %config(noreplace) %{_sysconfdir}/pki/%{name}/*
 %attr(0644,%{name},mail) %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+#configuration directory
 %attr(0644,%{name},mail) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
+%attr(0644,%{name},mail) %config(noreplace) %{_sysconfdir}/%{name}/blacklister.conf
+%attr(0644,%{name},mail) %config(noreplace) %{_sysconfdir}/%{name}/relayed.conf
+#
 %attr(0644,root,root) %config(noreplace) %{dovedir}/dovecot.conf
 %{dovedir}/dovecot-2.0*
 %attr(0640,%{name},dovecot) %config(noreplace) %{dovedir}/passfile