Commit Graph

2215 Commits

Author SHA1 Message Date
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
Lukas M
c0f6e5a134
Update default-ssl.conf 2018-12-31 18:03:39 +01:00
Lukas M
628aaf2748
Update entrypoint 2018-12-31 17:36:52 +01:00
Lukas M
809ca0fcfe
Update Dockerfile 2018-12-31 17:13:31 +01:00
Lukas M
4faedf3e5b
Update entrypoint 2018-12-31 16:58:51 +01:00
Lukas M
728be37de9
Update Dockerfile 2018-12-31 15:37:48 +01:00
Lukas M
7fb0631ff0
Update entrypoint 2018-12-31 15:37:19 +01:00
Marti Raudsepp
542e953919 Check that stored private keys match certificates
This is done in two places:
* Certificate import validator -- throws validation errors.
* Certificate model constructor -- to ensure integrity of Lemur's data
  even when issuer plugins or other code paths have bugs.
2018-12-31 16:28:20 +02:00
Lukas M
6b1d2bfb60
Create default-ssl.conf 2018-12-31 14:55:13 +01:00
Lukas M
341756d7c0
Update entrypoint 2018-12-31 14:07:56 +01:00
Lukas M
d6a374130c
Update entrypoint 2018-12-31 13:33:58 +01:00
Lukas M
666f180482
Update Dockerfile 2018-12-31 13:21:30 +01:00
Lukas M
c94557f2ed
Update entrypoint 2018-12-31 13:21:13 +01:00
Lukas M
ca6f2b782b
Update supervisor.conf 2018-12-31 12:52:07 +01:00
Lukas M
239acb5f95
Update supervisor.conf 2018-12-31 12:49:21 +01:00
Lukas M
25c4672845
Update supervisor.conf 2018-12-31 10:41:19 +01:00
Lukas M
aefdead50a
Update entrypoint 2018-12-31 00:04:58 +01:00
Lukas M
e488c0ddcf
Update Dockerfile 2018-12-30 23:57:14 +01:00
Lukas M
ba20c07420
Update entrypoint 2018-12-30 23:54:31 +01:00