Managing firma config file

2 files changed, 56 insertions, 4 deletions

diff --git a/files/firma/firma.conf b/files/firma/firma.conf
new file mode 100644
index 0000000..36b0f29
--- /dev/null
+++ b/files/firma/firma.conf
@@ -0,0 +1,50 @@
+#
+# Default firma configuration file
+#
+
+# Path to the GnuPG binary
+GPG_BINARY='/usr/bin/gpg'
+
+# Path to the mailing lists directory
+LISTS_DIR='/var/lib/firma/lists'
+
+# Path to the mail transport agent to be used (e.g., sendmail)
+MAIL_AGENT='/usr/sbin/sendmail'
+
+# Command-line arguments to be passed to the command above
+MAIL_AGENT_ARGS='-t'
+
+# User that runs firma (usually the same as your MTA user);
+# defaults to "firma"; you can also specify this parameter
+# in each mailing list config file if you plan to have one
+# user per mailing list
+FIRMA_USER='firma'
+
+# Group that runs firma (usually the same as your MTA group);
+# defaults to "nobody"; you can also specify this parameter
+# in each mailing list config file if you plan to have one
+# group per mailing list
+FIRMA_GROUP='firma'
+
+# Set to '1' to log errors and warnings to syslog, else firma
+# will print errors to STDERR
+LOG_TO_SYSLOG='1'
+
+# If logging to syslog, set the path to logger's binary
+LOGGER_BINARY='/usr/bin/logger'
+
+# If logging to syslog, set a priority for the error messages (defaults to 'user.err')
+#SYSLOG_PRIORITY=''
+
+# Set to '1' to use GnuPG's --hidden-recipient option, available from
+# version 1.4.0 onwards (try 'man gpg' for more information)
+USE_GPG_HIDDEN_RECIPIENT_OPTION=''
+
+# Headers that should be stripped from list messages on all lists
+# running under firma (space separated case-insensitive entries)
+# (may include regexps (e.g., X-.*)
+REMOVE_THESE_HEADERS_ON_ALL_LISTS=''
+
+# Default keyserver to import/export keys
+# (defaults to keys.indymedia.org)
+KEYSERVER=''
diff --git a/manifests/firma.pp b/manifests/firma.pp
index a2525c3..23dd51e 100644
--- a/manifests/firma.pp
+++ b/manifests/firma.pp
@@ -47,10 +47,12 @@ class mail::firma {
     require => Vcsrepo['/var/lib/firma'],
   }
 
-  exec { 'cp /var/lib/firma/firma.conf.dist /var/lib/firma/firma.conf && chmod 600 /var/lib/firma/firma.conf':
-    creates => '/var/lib/firma/firma.conf',
-    user    => 'firma',
-    group   => 'firma',
+  file { '/var/lib/firma/firma.conf':
+    ensure => present,
+    owner   => firma,
+    group   => firma,
+    mode    => 0600,
     require => Vcsrepo['/var/lib/firma'],
+    source => "puppet:///modules/mail/firma/firma.conf",
   }
 }