Enclosing config with quotes / changing default keyserver

2 files changed, 18 insertions, 18 deletions

diff --git a/firma b/firma
index 3c40377..781e5b8 100755
--- a/firma
+++ b/firma
@@ -45,7 +45,7 @@ $(AdminHelp)
 For help with admin and config paramaters, type $BASENAME --help task-name
 
 Report bugs to <firma@sarava.org>, encrypting your message using the
-public key 0xD68AFEDC, available at keyserver.noreply.org."
+public key 0xD68AFEDC, available at keys.indymedia.org."
 }
 
 
@@ -218,7 +218,7 @@ WARNING: Setting USE_GPG_HIDDEN_RECIPIENT_OPTION to '0' for this run."
 
     # check KEYSERVER value
     if [[ -z "$(echo "$KEYSERVER" | tr -d '[:space:]')" ]]; then
-      KEYSERVER="keyserver.noreply.org"
+      KEYSERVER="keys.indymedia.org"
     fi
 
   fi
@@ -2197,7 +2197,7 @@ function EvalConfigParameter {
     return 1
   fi
 
-  echo "$(grep "^$2=" $1 | sed -e "s/^$2=//" | tail -n 1)"
+  echo "$(grep "^$2=" $1 | sed -e "s/^$2='//" -e "s/'$//" | tail -n 1)"
 
 }
 
@@ -2262,7 +2262,7 @@ function SourceFirmaConfig {
   REMOVE_THESE_HEADERS_ON_ALL_LISTS="$(EvalConfigParameter $FIRMA_CONFIG_FILE REMOVE_THESE_HEADERS_ON_ALL_LISTS)"
 
   [[ "$1" == "help" ]] && echo -e "\tKEYSERVER= default keyserver to import/export keys
-\t           (defaults to keyserver.noreply.org)." || \
+\t           (defaults to keys.indymedia.org)." || \
   KEYSERVER="$(EvalConfigParameter $FIRMA_CONFIG_FILE KEYSERVER)"
 }
 
@@ -2335,7 +2335,7 @@ function SourceListConfig {
   SILENTLY_DISCARD_INVALID_MESSAGES="$(EvalConfigParameter $LIST_CONFIG_FILE SILENTLY_DISCARD_INVALID_MESSAGES)"
 
   [[ "$1" == "help" ]] && echo -e "\tKEYSERVER= default keyserver to import/export keys
-\t           (defaults to keyserver.noreply.org)." || \
+\t           (defaults to keys.indymedia.org)." || \
   keyserver="$(EvalConfigParameter $LIST_CONFIG_FILE KEYSERVER)"
   [[ -n "$keyserver" ]] && KEYSERVER="$keyserver"
 
diff --git a/firma.conf.dist b/firma.conf.dist
index 7805730..36b0f29 100644
--- a/firma.conf.dist
+++ b/firma.conf.dist
@@ -3,48 +3,48 @@
 #
 
 # Path to the GnuPG binary
-GPG_BINARY=/usr/bin/gpg
+GPG_BINARY='/usr/bin/gpg'
 
 # Path to the mailing lists directory
-LISTS_DIR=/var/lib/firma/lists
+LISTS_DIR='/var/lib/firma/lists'
 
 # Path to the mail transport agent to be used (e.g., sendmail)
-MAIL_AGENT=/usr/sbin/sendmail
+MAIL_AGENT='/usr/sbin/sendmail'
 
 # Command-line arguments to be passed to the command above
-MAIL_AGENT_ARGS=-t
+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
+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
+FIRMA_GROUP='firma'
 
 # Set to '1' to log errors and warnings to syslog, else firma
 # will print errors to STDERR
-LOG_TO_SYSLOG=1
+LOG_TO_SYSLOG='1'
 
 # If logging to syslog, set the path to logger's binary
-LOGGER_BINARY=/usr/bin/logger
+LOGGER_BINARY='/usr/bin/logger'
 
 # If logging to syslog, set a priority for the error messages (defaults to 'user.err')
-#SYSLOG_PRIORITY=
+#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=
+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=
+REMOVE_THESE_HEADERS_ON_ALL_LISTS=''
 
 # Default keyserver to import/export keys
-# (defaults to keyserver.noreply.org)
-KEYSERVER=
+# (defaults to keys.indymedia.org)
+KEYSERVER=''