Merge pull request #1 from edx/jarv/single-server-config

changes to support certificates on disk in addition to S3

.travis.yml

@@ -0,0 +1,13 @@
+# Travis CI configuration file for running tests
+language: python
+python:
+  - "2.7"
+install:
+  - "pip install --allow-all-external -r requirements.txt"
+script:
+  - |
+    curl https://raw.githubusercontent.com/edx/configuration/master/playbooks/roles/certs/files/example-private-key.txt -o /var/tmp/key.txt
+    curl https://raw.githubusercontent.com/edx/configuration/rc/injera/playbooks/roles/certs/files/example-key-ownertrust.txt -o /var/tmp/trust.txt
+    /usr/bin/gpg --import /var/tmp/key.txt
+    /usr/bin/gpg --import-ownertrust /var/tmp/trust.txt
+    nosetests tests.gen_cert_test:test_cert_gen

README.md

@@ -136,12 +136,20 @@ To run the test suite:
         CERT_AWS_ID = # Amazon Web Services ID
         CERT_AWS_KEY = # Amazon Web Services Key
         CERT_BUCKET = # Amazon Web Services S3 bucket name
-        
 
-2. From the `certificates` directory, run:
+   It is also acceptable to leave the AWS KEY and ID values as none and instead
+   use .boto file or run this code from a server that has an
+   IAM role that gives it write access to the bucket in the configuration.
+
+2. To run all of the tests from the `certificates` directory, run:
 
         nosetests
 
+   Note that this will run tests that will fail unless AWS credentials are setup. To run just
+   the tests for local on-disk publishing run:
+
+        nosetests tests.gen_cert_test:test_cert_gen
+
 
 **Troubleshooting**: If tests fail with errors, try running:
 

create_pdfs.py

@@ -87,7 +87,7 @@ def main():
             )
             (download_uuid, verify_uuid,
                 download_url) = cert.create_and_upload(
-                    name, upload=True, cleanup=False)
+                    name, upload=True, copy_to_webroot=False, cleanup=False)
             certificate_data.append([name, download_url])
             gen_dir = os.path.join(
                 cert.dir_prefix, S3_CERT_PATH, download_uuid)