Просмотр исходного кода

Merge pull request #81 from digiorgi/master

coleslaw-s3::*credentials* was useless and not setting the important …
Brit Butler лет назад: 10
Родитель
Сommit
c45d7be575
1 измененных файлов с 3 добавлено и 6 удалено
  1. 3 6
      plugins/s3.lisp

+ 3 - 6
plugins/s3.lisp

@@ -10,11 +10,6 @@
10 10
 
11 11
 (in-package :coleslaw-s3)
12 12
 
13
-(defparameter *credentials* nil
14
-  "The credentials to authenticate with Amazon Web Services.
15
-Stored in a file with the access key on the first line
16
-and the secret key on the second.")
17
-
18 13
 (defparameter *content-type-map* '(("html" . "text/html")
19 14
                                    ("css" . "text/css")
20 15
                                    ("png" . "image/png")
@@ -53,5 +48,7 @@ and the secret key on the second.")
53 48
     (zs3:delete-objects (stale-keys) *bucket*)))
54 49
 
55 50
 (defun enable (&key auth-file bucket)
56
-  (setf *credentials* (zs3:file-credentials auth-file)
51
+  "AUTH-FILE: Path to file with the access key on the first line and the secret 
52
+   key on the second."
53
+  (setf zs3:*credentials* (zs3:file-credentials auth-file)
57 54
         *bucket* bucket))