Skip to content

Commit

Permalink
Merge pull request #65 from sourcelair/configurable-certificates
Browse files Browse the repository at this point in the history
Introduce configurable certificates per route
  • Loading branch information
parisk committed Apr 26, 2019
2 parents 3ebb5e9 + 2ed1f4b commit 3d7c6c4
Show file tree
Hide file tree
Showing 38 changed files with 1,120 additions and 683 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Expand Up @@ -15,3 +15,6 @@ docker-compose.yaml
# Ignore generated files from template
ceryx/nginx/conf/ceryx.conf
ceryx/nginx/conf/nginx.conf

.mypy_cache
.pytest_cache
4 changes: 1 addition & 3 deletions .travis.yml
Expand Up @@ -10,14 +10,12 @@ install:
- pip install --upgrade --ignore-installed docker-compose==${DOCKER_COMPOSE_VERSION}
- docker-compose build

- pip install pipenv==2018.11.26
- bash -c "cd api && pipenv install --dev --deploy --system"

services:
- redis-server
- docker

script:
- docker-compose up -d
- docker-compose run api ./bin/test
- docker-compose run test

Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -30,8 +30,8 @@ Ceryx is configured with the following environment variables:
- `CERYX_REDIS_PASSWORD`: Optional password to use for authenticating with Redis (default: None)
- `CERYX_REDIS_PORT`: The where Redis should be reached (default: `6379`)
- `CERYX_REDIS_PREFIX`: The prefix to use in Ceryx-related Redis keys (default: `ceryx`)
- `CERYX_SSL_CERT_KEY`: The path to the fallback SSL certificate key (default: randomly generated)
- `CERYX_SSL_CERT`: The path to the fallback SSL certificate (default: randomly generated)
- `CERYX_SSL_DEFAULT_CERTIFICATE`: The path to the fallback SSL certificate (default: `/etc/ceryx/ssl/default.crt`randomly generated at build time)
- `CERYX_SSL_DEFAULT_KEY`: The path to the fallback SSL certificate key (default: `/etc/ceryx/ssl/default.key`randomly generated at build time)

## Adjusting log level

Expand Down
3 changes: 2 additions & 1 deletion api/Dockerfile
Expand Up @@ -11,4 +11,5 @@ RUN pipenv install --system --dev --deploy
COPY . /opt/ceryx
WORKDIR /opt/ceryx

CMD python app.py
ENV PORT 5555
CMD python api.py
5 changes: 4 additions & 1 deletion api/Pipfile
Expand Up @@ -4,13 +4,16 @@ verify_ssl = true
name = "pypi"

[packages]
apistar = "==0.4.3"
redis = "*"
requests = ">=2.21.0"
typesystem = "*"
responder = "*"

[dev-packages]
nose = "*"
black = "==18.9b0"
pytest = "*"
mypy = "*"

[requires]
python_version = "3.6"

0 comments on commit 3d7c6c4

Please sign in to comment.