From 8b4c297cd6dd57393dc066e80087bb1c75bd7963 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 10 Apr 2012 19:48:09 -0300
Subject: Changing default config parameters

---
 README          |  4 ++--
 firma           |  2 +-
 firma.conf      | 50 --------------------------------------------------
 firma.conf.dist | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 53 insertions(+), 53 deletions(-)
 delete mode 100644 firma.conf
 create mode 100644 firma.conf.dist

diff --git a/README b/README
index 4c79605..7da6fdc 100644
--- a/README
+++ b/README
@@ -140,9 +140,9 @@ Setup
  2 - Copy firma script to whatever you like, e.g. /usr/local/bin and check that
      it has no write permission
 
- 3 - Create a list-wide config file (default is /etc/firma.conf) with
+ 3 - Create a list-wide config file (default is /var/lib/firma/firma.conf) with
      the common definitions for all lists. You might just copy the sample
-     firma.conf and edit according to your needs.
+     firma.conf.dist and edit according to your needs.
 
      All config variables can be overwritten at each list's own config file;
      firma.conf should be chmoded as 600, chowned nobody.nobody or whatever
diff --git a/firma b/firma
index 692328f..a04125e 100755
--- a/firma
+++ b/firma
@@ -2471,7 +2471,7 @@ function ReplayProtectionCheck {
 
 # hardcode path to firma.conf, firma version and program name
 declare -r \
-  FIRMA_CONFIG_FILE="/etc/firma.conf" \
+  FIRMA_CONFIG_FILE="/var/lib/firma/firma.conf" \
   VERSION="0.3-git" \
   BASENAME="$(basename $0)"
 
diff --git a/firma.conf b/firma.conf
deleted file mode 100644
index f398a06..0000000
--- a/firma.conf
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# 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 "nobody"; you can also specify this parameter
-# in each mailing list config file if you plan to have one
-# user per mailing list
-FIRMA_USER=nobody
-
-# 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=nobody
-
-# Set to '1' to log errors and warnings to syslog, else firma
-# will print errors to STDERR
-LOG_TO_SYSLOG=0
-
-# If logging to syslog, set the path to logger's binary
-#LOGGER_BINARY=
-
-# 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 keyserver.noreply.org)
-KEYSERVER=
diff --git a/firma.conf.dist b/firma.conf.dist
new file mode 100644
index 0000000..9ec48fb
--- /dev/null
+++ b/firma.conf.dist
@@ -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=0
+
+# If logging to syslog, set the path to logger's binary
+#LOGGER_BINARY=
+
+# 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 keyserver.noreply.org)
+KEYSERVER=
-- 
cgit v1.2.3