Changing default config location, version update and config fixes

diff --git a/README b/README
index 09b2091c1cc7d1dddd002648eea17f36416dc518..7918dd1b34a7a9e9689cd7637814f340a907ba83 100644 (file)
--- a/README
+++ b/README
@@ -140,7 +140,7 @@ 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 /usr/local/etc/firma.conf) with
+ 3 - Create a list-wide config file (default is /etc/firma.conf) with
      the common definitions for all lists,
 
        GPG_BINARY= path to the GnuPG binary
@@ -289,7 +289,7 @@ Tips
 
  - Use an encrypted swap memory
  - Use a read-only media to store firma and its needed apps
- - Use ramdisk to FIRMA_LIST_PATH so all keys and passwords vanishes if the server friezes
+ - Use ramdisk to FIRMA_LIST_PATH so all keys and passwords vanishes if the server is shutdown
  - Use a big PASSPHRASE, 25+ chars with alpha-numeric and special ascii keys
 
 Design and features (OUTDATED)

diff --git a/firma b/firma
index 955f14e510071e74569202b08c7bc486ebc7f619..e1c773f25bdc22646525f39905c39331110f5d67 100755 (executable)
--- a/firma
+++ b/firma
@@ -2471,8 +2471,8 @@ function ReplayProtectionCheck {
 
 # hardcode path to firma.conf, firma version and program name
 declare -r \
-  FIRMA_CONFIG_FILE="/usr/local/etc/firma.conf" \
-  VERSION="0.3-CVS" \
+  FIRMA_CONFIG_FILE="/etc/firma.conf" \
+  VERSION="0.3-git" \
   BASENAME="$(basename $0)"
 
 # set environmental variables and options