Changing default config parameters

diff --git a/README b/README
index 4c796050333fa555457159a11eb724027e91d620..7da6fdcff783594b343fd93d908ec501141a605f 100644 (file)
--- 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 692328f5a96ebf44c9fea75d3b8d6fa0a3775909..a04125e0849b13cb1f86cf9125bdd673d9d8bb15 100755 (executable)
--- 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.dist
similarity index 93%
rename from firma.conf
rename to firma.conf.dist
index f398a0653bc31697e21f2ac7d798191bc7af6dd5..9ec48fb0307f844587132f74474d35521a4aa46a 100644 (file)
--- a/firma.conf
+++ b/firma.conf.dist
@@ -15,16 +15,16 @@ MAIL_AGENT=/usr/sbin/sendmail
 MAIL_AGENT_ARGS=-t
 
 # User that runs firma (usually the same as your MTA user);
-# defaults to "nobody"; you can also specify this parameter
+# 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=nobody
+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=nobody
+FIRMA_GROUP=firma
 
 # Set to '1' to log errors and warnings to syslog, else firma
 # will print errors to STDERR