Minor changes

* doc/wydawca.texi: Fix documentation of ${timer:wydawca}
* etc/wydawca.rc: Rename to etc/wydawca.conf.  Edit.
* src/triplet.c: The "wydawca" timer is synonymous to "spool".
* src/wydawca.h (WY_TIMER_WYDAWCA): Remove.

2 files changed, 51 insertions, 20 deletions

diff --git a/etc/Makefile.am b/etc/Makefile.am
index 9b892f8..4c8db76 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -14,12 +14,12 @@
 # You should have received a copy of the GNU General Public License
 # along with Wydawca.  If not, see <http://www.gnu.org/licenses/>.
 
-EXTRA_DIST=wydawca.rc 
+EXTRA_DIST=wydawca.conf
 
 install-data-local:
 	@test -d $(DESTDIR)$(sysconfdir) || \
            ${INSTALL} -d $(DESTDIR)$(sysconfdir); \
-	conf=$(DESTDIR)$(sysconfdir)/wydawca.rc; \
+	conf=$(DESTDIR)$(sysconfdir)/wydawca.conf; \
 	if [ -r $$conf ]; then \
 		echo $$conf | sed 's,.,=,g'; \
 		echo "Warning: The configuration file $$conf already exists"; \
diff --git a/etc/wydawca.rc b/etc/wydawca.conf
index 935d314..bd87c2b 100644
--- a/etc/wydawca.rc
+++ b/etc/wydawca.conf
@@ -82,14 +82,17 @@ dictionary project-uploader {
 /* Configure email notifications
  * See `info wydawca notification', for a description.
  */
+module mailutils mod_mailutils.so;
 
-admin-address "root@localhost";
-from-address "wydawca@localhost";
+module-init mailutils {
+  mailer "smtp://localhost;notls;noauth";
+  admin-address "root@localhost";
+  from-address "wydawca@localhost";
 
-# See `info wydawca statreports'.
-mail-statistics {
-  statistics all;
-  message <<EOT
+  # See `info wydawca statreports'.
+  mail-statistics {
+    statistics all;
+    message <<EOT
 Subject: Wydawca stats
 
 This is to notify you that the run of wydawca on ${date}
@@ -113,6 +116,7 @@ verification failures .............. ${stat:check_failures}
 Regards,
 Wydawca
 EOT;
+  }
 }
 
 # See `info wydawca event'.
@@ -120,8 +124,10 @@ EOT;
 # Notify the user about successful uploads
 notify-event {
   event success;
-  message <<EOT
-To: ${email:user}
+  module mailutils;
+  module-config {
+    recipient user;
+    message <<EOT
 Subject: Upload of ${project} successful
 
 Upload of ${project} to ${dir} finished successfully. Files uploaded:
@@ -132,13 +138,16 @@ Regards,
 Wydawca
 The Project Submission Robot
 EOT;
+  }
 }
 
 # Notify project admin about a successful upload.
 notify-event {
   event success;
-  message <<EOT
-To: ${email:owner}
+  module mailutils;
+  module-config {
+    recipient owner;
+    message <<EOT
 Subject: Upload of ${project} successful
 
 ${user:real_name} (${user:email}) successfully uploaded files
@@ -150,6 +159,7 @@ Regards,
 Wydawca
 The Project Submission Robot
 EOT;
+  }
 }
 
 /* Notify project admin, if someone non authorized attempted to upload some
@@ -157,8 +167,10 @@ EOT;
  */
 notify-event {
   event bad-ownership;
-  message <<EOT
-To: ${email:owner}
+  module mailutils;
+  module-config {
+    recipient owner;
+    message <<EOT
 Subject: Suspicious upload of ${project}
 
 Someone not authorized to make releases for ${project}
@@ -176,6 +188,7 @@ Regards,
 Wydawca
 The Project Submission Robot
 EOT;
+  }
 }
 
 /* Notify the project admin, if submitted directive signature did not match
@@ -183,8 +196,10 @@ EOT;
  */
 notify-event {
   event bad-directive-signature;
-  message <<EOT
-To: ${email:owner}
+  module mailutils;
+  module-config {
+    recipient owner;
+    message <<EOT
 Subject: Suspicious upload of ${project}
 
 ${user:real_name} (${user:email}) has tried to make a release
@@ -199,6 +214,7 @@ Regards,
 Wydawca
 The Project Submission Robot
 EOT;
+  }
 }
 
 /* Notify the user (submitter), if the detached signature did not match
@@ -209,7 +225,10 @@ EOT;
  */
 notify-event {
   event bad-detached-signature;
-  message <<EOT
+  module mailutils;
+  module-config {
+    recipient user;
+    message <<EOT
 To: ${email:user}
 Subject: Suspicious upload of ${project}
 
@@ -228,6 +247,7 @@ Regards,
 Wydawca
 The Project Submission Robot
 EOT;
+  }
 }
 
 /* Notify the project admin, if submitted detached signature did not match
@@ -235,8 +255,10 @@ EOT;
  */
 notify-event {
   event bad-detached-signature;
-  message <<EOT
-To: ${email:owner}
+  module mailutils;
+  module-config {
+    recipient owner;
+    message <<EOT
 Subject: Suspicious upload of ${project}
 
 ${user:real_name} (${user:email}) has tried to make a release
@@ -251,6 +273,7 @@ Regards,
 Wydawca
 The Project Submission Robot
 EOT;
+  }
 }
 
 /* Notify both the submitter and the project owner about uploads
@@ -260,7 +283,9 @@ EOT;
  */
 notify-event {
   event check-failure;
-  message <<EOT
+  module mailutils;
+  module-config {
+    message <<EOT
 To: ${email:user}
 Cc: ${email:owner}
 Subject: ${triplet:dist} rejected
@@ -277,6 +302,12 @@ Regards,
 Wydawca
 The Project Submission Robot
 EOT;
+  }
+}
+
+notify-event {
+  event finish;
+  module mailutils;
 }
 
 /* Make sure the distributed tarball does not contain security vulnerabilities