Commit Graph

2383 Commits

Author SHA1 Message Date
Curtis 4842bb0880
Merge pull request #2376 from castrapel/fix_letsencrypt_sans
Fix letsencrypt sans
2019-01-17 15:21:18 -08:00
Curtis Castrapel d689f5cda3 Fix LetsEncrypt for duplicate CN/SAN 2019-01-17 14:59:57 -08:00
Curtis Castrapel 0336d68ee2 Merge remote-tracking branch 'upstream/master' 2019-01-17 14:56:12 -08:00
Curtis Castrapel 7f88c24e83 Fix LetsEncrypt Dyn flow for duplicate CN/SAN 2019-01-17 14:56:04 -08:00
Curtis 3022af4410
Merge pull request #2367 from hosseinsh/master
fixing-lemur-authorities-CN-filtering
2019-01-15 08:15:59 -08:00
Hossein Shafagh d3284a4006 adjusting the query to filter authorities based on matching CN 2019-01-14 17:52:06 -08:00
Hossein Shafagh f9618def0b Merge branch 'master' of github.com:Netflix/lemur 2019-01-14 17:45:35 -08:00
Curtis cbfdd0c531
Merge pull request #2360 from Netflix/compare_cert_hashes
Compare certificate hashes
2019-01-14 13:48:43 -08:00
Curtis Castrapel 3567a768d5 Compare certificate hashes to determine if Lemur already has a synced certificate 2019-01-14 13:35:55 -08:00
Curtis 2c545aa4bc
Merge pull request #2359 from castrapel/db_cert_filtering_2
Reduce the expense of joins during cert query
2019-01-14 10:11:28 -08:00
Curtis 757b99e6e5
Merge branch 'master' into db_cert_filtering_2 2019-01-14 09:35:32 -08:00
Curtis Castrapel 31a86687e7 Reduce the expense of joins 2019-01-14 09:20:02 -08:00
Curtis 42ffeda90d
Merge pull request #2358 from castrapel/db_cert_filtering
Optimize DB cert filtering
2019-01-14 08:25:50 -08:00
Curtis Castrapel c4e6e7c59b Optimize DB cert filtering 2019-01-14 08:02:27 -08:00
Curtis 5ebfba26d7
Merge pull request #2338 from castrapel/more_retries
Be more forgiving to throttling
2019-01-11 11:40:08 -08:00
Curtis 638a8450a3
Merge branch 'master' into more_retries 2019-01-11 11:25:00 -08:00
Curtis Castrapel 0e02e6da79 Be more forgiving to throttling 2019-01-11 11:13:43 -08:00
Hossein Shafagh 5118681cb5
Merge pull request #2269 from intgr/verify-cert-private-key
Check that stored private keys match certificates
2019-01-10 17:01:34 -08:00
Curtis 1570cdb5d4
Merge branch 'master' into verify-cert-private-key 2019-01-10 09:50:57 -08:00
Curtis 7b70719ea7
Merge pull request #2326 from castrapel/upreq-11019
Update requirements
2019-01-10 09:38:20 -08:00
Curtis Castrapel 3ee12cc50b Update requirements 2019-01-10 09:26:15 -08:00
Hossein Shafagh cb42685322 Merge branch 'intgr-verify-cert-private-key' 2019-01-09 16:31:56 -08:00
sirferl a1ca61d813 changed a too long comment 2019-01-09 09:50:26 +01:00
Curtis 707affec01
Merge branch 'master' into ADCS-plugin 2019-01-08 10:59:19 -08:00
Curtis cdf9a53a40
Merge branch 'master' into verify-cert-private-key 2019-01-08 10:53:28 -08:00
Curtis 3637410327
Merge pull request #2290 from bby-bishopclark/patch-1
Update index.rst
2019-01-08 10:52:56 -08:00
Curtis 7bc95ba6ee
Merge branch 'master' into patch-1 2019-01-08 10:51:29 -08:00
Curtis c5ed0f3f81
Merge pull request #2312 from castrapel/up-reqs-1-2019
Update requirements with Kombu fix
2019-01-08 10:51:16 -08:00
Hossein Shafagh f1e3777947 Merge branch 'verify-cert-private-key' of https://github.com/intgr/lemur into intgr-verify-cert-private-key 2019-01-08 10:49:30 -08:00
Curtis b0a2d2a907
Merge branch 'master' into up-reqs-1-2019 2019-01-08 10:22:59 -08:00
Curtis 61b64d9353
Merge pull request #2280 from lukasmrtvy/master
WIP: Alpine Docker
2019-01-08 10:22:30 -08:00
Curtis Castrapel c95fde7023 Better fix for kombu is to unpin it and modify makefile 2019-01-08 09:55:53 -08:00
Curtis Castrapel faa91ef2a7 Update requirements with Kombu fix 2019-01-08 09:47:46 -08:00
sirferl af88ad0f0d changed broken kombu ref. from 4.2.2 to 4.2.1 because travis build fails 2019-01-07 11:35:56 +01:00
sirferl a43476bc87 minor errors after lint fix 2019-01-07 11:04:27 +01:00
sirferl 054685fc38
Merge branch 'master' into ADCS-plugin 2019-01-07 10:23:18 +01:00
sirferl c62bcd1456 repaired several lint errors 2019-01-07 10:02:37 +01:00
bby-bishopclark 3ac5361cb2
Update index.rst
Simple English gaffes noticed while perusing docs -- Setup vs set up, it's vs English, etc.
2019-01-03 07:58:42 -08:00
Lukas M 7cbdc09055
Update entrypoint 2019-01-01 12:09:06 +01:00
Lukas M 125a885742
Update Dockerfile 2019-01-01 11:50:48 +01:00
Lukas M 6c1129c946
Rename docker/lemur.conf.py to docker/src/lemur.conf.py 2019-01-01 11:50:14 +01:00
Lukas M 949ebfa285
Update Dockerfile 2019-01-01 11:49:49 +01:00
Lukas M 248c0d226f
Rename docker/default.conf to docker/nginx/default.conf 2019-01-01 11:49:36 +01:00
Lukas M 4570fcf7fa
Rename docker/default-ssl.conf to docker/nginx/default-ssl.conf 2019-01-01 11:49:24 +01:00
Lukas M 28382ce728
Update default-ssl.conf 2019-01-01 11:48:42 +01:00
Lukas M bb4b781d24
Update entrypoint 2019-01-01 11:46:56 +01:00
Lukas M 0d0c295f82
Update entrypoint 2019-01-01 11:33:49 +01:00
Lukas M 3cc63c6618
Update entrypoint 2019-01-01 11:05:45 +01:00
Lukas M ff0dbdcc5a
Update entrypoint 2018-12-31 18:36:02 +01:00
Lukas M 918af0873f
Update default-ssl.conf 2018-12-31 18:35:17 +01:00