EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,858 Commits
41 Branches
2 Tags
154 MiB
Commit Graph

5858 Commits (d334d158a8e52d368e3a52a8272bb15ac6f890b2)

Author SHA1 Message Date
eshellman d334d158a8 Merge pull request #660 from Gluejar/more_key_cleanup 
a bit of cleanup for keys
 2017-01-17 11:42:46 -05:00
Raymond Yee 12e5fa2f8f typo 2017-01-16 17:48:50 -08:00
Raymond Yee 5596de6de4 update documentation on vagrant ansible. 2017-01-16 17:39:20 -08:00
Raymond Yee 1e4c354583 Merge branch 'master' into more_key_cleanup 2017-01-16 16:01:52 -08:00
eshellman c2f9047c90 Merge pull request #650 from Gluejar/add-doab-authlist 
everything ran fine on my laptop
 2017-01-16 13:21:15 -05:00
Raymond Yee 2beb02c3d0 * deleted settings/localvm.py 
* add comment about a key in prod
* deleted comment in settings/just.py
 2017-01-13 22:37:21 -08:00
Raymond Yee ae6e852c67 update doab.json 2017-01-12 14:31:47 -08:00
Raymond Yee b1ec19eb85 Merge branch 'master' into add-doab-authlist 2017-01-12 14:27:56 -08:00
eshellman 825ba6aa52 Merge pull request #659 from Gluejar/update_ssl_cert 
new SSL certificate -- expires Jan 28, 2018
 2017-01-12 10:50:12 -05:00
Raymond Yee 34804d0ad8 new SSL certificate -- expires Jan 28, 2018 2017-01-11 21:16:54 -08:00
eshellman f7dab3a514 Merge pull request #658 from Gluejar/fix_vagrant_aws 
tweeks to Vagrantfile to fail if certain environment variables are not set; reset database root pw
 2017-01-11 17:02:33 -05:00
Raymond Yee e7f5bb61e7 * use ENV.fetch to have vagrant fail if certain environment variables are not set. 
* reset root password on the Amazon RDS instances for just and prod
 2017-01-11 12:20:28 -08:00
Raymond Yee a84e8fb8b6 fix problems for please 2017-01-06 18:35:49 -08:00
Raymond Yee b3f7390d21 Merge pull request #656 from Gluejar/kombu_dep 
Kombu dependence -- should be removed from jenkins and dev
 2017-01-06 16:37:27 -08:00
Raymond Yee 2b6901b347 return prod/secrets.yml to values in master branch 2017-01-06 16:34:43 -08:00
Raymond Yee 03de890a71 no need for djkombu -- superceded by kombu 
https://pypi.python.org/pypi/django-kombu
 2017-01-06 16:23:23 -08:00
eshellman dce00cc685 Merge pull request #655 from Gluejar/no-dj-nose-selenium 
see if django-nose-selenium was the problem
 2017-01-06 17:06:28 -05:00
eric 58f1452988 see if django-nose-selenium was the problem 2017-01-06 16:59:55 -05:00
eshellman 41416ef23e Merge pull request #654 from Gluejar/mock-integration 
Mock integration. Merge this to test on Jenkins, which was sort of the point
 2017-01-06 13:53:16 -05:00
eric 93b9501a1c remove secrets from jenkins 2016-12-30 23:06:18 -05:00
eric b9053183ba passes all tests without secret keys 2016-12-30 22:26:16 -05:00
eric cf57c78686 bookloader is mocked 2016-12-30 17:24:20 -05:00
eric 31b6187a5c fix #120246845 
2 isbns map to one google id
 2016-12-30 10:24:01 -05:00
eric 5eebeae378 frontend tests run on fixtures 2016-12-29 14:11:17 -05:00
eric fffd5012ad api tests now run on a fixture 2016-12-29 13:44:26 -05:00
Raymond Yee f725998dd8 Merge pull request #653 from Gluejar/open_source 
Open source: removing keys from common, please, just, and prod
 2016-12-27 23:54:24 -05:00
Raymond Yee 6f2cad604a cleanup of Vagrantfile and prod.py 2016-12-27 23:37:11 -05:00
Raymond Yee 918e2e3b80 new lower privilege db password 2016-12-27 22:32:37 -05:00
Raymond Yee bff6a6d3ee on just: trying out a non root pw 
on please: reset database pw
 2016-12-27 21:38:23 -05:00
Raymond Yee d3391b7515 a few comments about existing keys in jenkins.py 2016-12-27 14:27:28 -05:00
Raymond Yee ff014b8349 remove remaining django_secret_key.yml 2016-12-26 20:37:04 -05:00
Raymond Yee f1a8709657 need to quote {{user}} 2016-12-21 21:28:46 -06:00
eric 088f08831c move db params to vault 2016-12-21 14:36:06 -05:00
eric 725b37e114 create keys/__init__.py 2016-12-21 12:51:21 -05:00
Raymond Yee f8f05312a5 fix please.py 
need to create directory settings/keys
 2016-12-20 22:37:17 -06:00
Raymond Yee f82a7c524a Merge branch 'open_source' of github.com:Gluejar/regluit into open_source 2016-12-20 21:57:41 -06:00
Raymond Yee ecaf0d1bfb allow for AWS_KEYPAIR_NAME and SSH_PRIVATE_KEY_PATH to be set via environment variables 2016-12-20 21:53:01 -06:00
eric 711e2242b9 docs 2016-12-20 14:55:53 -05:00
eric 7d749f068a revive settings files 2016-12-20 14:55:53 -05:00
Raymond Yee 3da10771d9 added instructions for running on localhost 2016-12-19 11:47:38 -08:00
Raymond Yee fee324d8ff instructions on using vagrant / ansible 2016-12-19 10:01:51 -08:00
Raymond Yee 1ac55c4f0a reset mobigen username / password 2016-12-17 20:58:36 -08:00
Raymond Yee 56081b643d Merge branch 'master' into open_source 2016-12-17 18:12:51 -08:00
Raymond Yee bb1cd956aa I think I've managed to compile a list of keys to clean up and remove corresponding comments. 
Next step is to build please, just, and a version of production to test out.
 2016-12-17 18:08:18 -08:00
Raymond Yee 47e18b008d cleaning up comments for just secrets, including comments about old keys 2016-12-17 16:15:15 -08:00
Raymond Yee 6d0ea3db34 move the setup of django_secret_key (aka SECRET_KEY) into the respective secrets.yml instead of using django_secret_key.yml 2016-12-17 14:49:17 -08:00
Raymond Yee d5f7b27f58 cleaning up comments about keys to invalidate in please 2016-12-17 13:59:29 -08:00
Raymond Yee 7ebbc26aef remove comments about old keys in common.py.j2 
hack to keep jenkins setup to keep working while the old keys have yet to be invalidated
 2016-12-17 12:31:39 -08:00
Raymond Yee ca85bb6a31 Merge branch 'master' into open_source 2016-12-17 11:42:31 -08:00
eshellman 90d173bad8 Merge pull request #652 from Gluejar/fix-PIL-IOErrors 
fix truncated image file problems
 2016-12-17 12:00:05 -05:00