]> gitweb.fluxo.info Git - firma.git/commitdiff
fixed config file creation
authorrhatto <rhatto>
Fri, 6 Oct 2006 22:42:25 +0000 (22:42 +0000)
committerrhatto <rhatto>
Fri, 6 Oct 2006 22:42:25 +0000 (22:42 +0000)
firma

diff --git a/firma b/firma
index c14f3f668b7ab46bd756f43f07b8ab16558a3275..a3254cc4d31374f3e0f9077cf64b3211214fff5c 100755 (executable)
--- a/firma
+++ b/firma
@@ -874,7 +874,7 @@ function NewList {
     if [ -f "$LIST_CONFIG_FILE" ]; then
       DeclareGpgVars
       # removed: MAIL_AGENT=$MAIL_AGENT\nGPG_BINARY=$GPG_BINARY\n
-      echo -e "LIST_HOMEDIR=\'$LIST_HOMEDIR\'\nLIST_ADDRESS=\'$LIST_ADDRESS\'\nLIST_ADMIN=\'$LIST_ADMIN\'\nPASSPHRASE=\'$PASSPHRASE\'" > $LIST_CONFIG_FILE
+      echo -e "LIST_HOMEDIR='$LIST_HOMEDIR'\nLIST_ADDRESS='$LIST_ADDRESS'\nLIST_ADMIN='$LIST_ADMIN'\nPASSPHRASE='$PASSPHRASE'" > $LIST_CONFIG_FILE
       echo "Now generating your keyring..."
 
       $GPG --gen-key <<EOF
@@ -893,6 +893,7 @@ function NewList {
 
 EOF
 
+      # TODO: import admin pubkey and send list pubkey to admin
       chown -R $USER.$GROUP $LIST_HOMEDIR
 
     else
@@ -1076,9 +1077,10 @@ function CheckPermission {
   perms=${perms:4:6}
   if [ "$perms" != "------" ]; then
     ERROR_MESSAGE="WARNING: Configuration files must not be group or world writable/readable! Dying on file $file"
-    echo $ERROR_MESSAGE
     if [[ "$LOG_TO_SYSLOG" == 1 ]]; then
       echo "$ERROR_MESSAGE" | $LOGGER_BINARY -p "$SYSLOG_PRIORITY" -t "$BASENAME"
+    else
+      echo $ERROR_MESSAGE
     fi
     return 1
   fi