Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unused newrelic #57

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,5 @@ ADD who.ini /who.ini
ADD ckan.ini /ckan.ini
ADD resource_formats.json /resource_formats.json

ADD newrelic.ini /newrelic.ini
ENV NEW_RELIC_CONFIG_FILE=/newrelic.ini

CMD ["newrelic-admin", "run-program", "gunicorn", "--workers", "2", "--worker-class", "gevent", "--paste", "ckan.ini", "-t", "600", "--log-file", "-"]
CMD ["gunicorn", "--workers", "2", "--worker-class", "gevent", "--paste", "ckan.ini", "-t", "600", "--log-file", "-"]
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,6 @@ dokku config:set ckan CKAN_SQLALCHEMY_URL=postgres://ckan_default:password@host/
CKAN___CKANEXT__S3FILESTORE__HOST_NAME=http://s3-eu-west-1.amazonaws.com/treasury-data-portal \
CKAN___CKANEXT__S3FILESTORE__REGION_NAME=eu-west-1 \
CKAN___CKANEXT__S3FILESTORE__SIGNATURE_VERSION=s3v4 \
NEW_RELIC_APP_NAME="Treasury CKAN" \
NEW_RELIC_LICENSE_KEY=... \
CKAN_DISCOURSE_URL= \
CKAN_DISCOURSE_SSO_SECRET=
```
Expand Down Expand Up @@ -334,9 +332,9 @@ cd ../treasury-ckan
- create database
- create a file `env.dev` in the project root, based on `env.tmpl` with DB and S3 bucket config
- To help you avoid committing sensitive information in this file to git, env* is hidden by gitignore.

Remove certain ckan plugins we don't strictly need in development mode. Edit `ckan.ini` and for the `plugins` entry, remove: s3filestore, discourse-sso-client, datastore and datapusher.

Now start the containers and their services:

```
Expand Down
2 changes: 0 additions & 2 deletions newrelic.ini

This file was deleted.

1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ Jinja2==2.8 # via flask
Mako==1.0.4 # via pylons
Markdown==2.6.7
MarkupSafe==0.23 # via jinja2, mako, webhelpers
newrelic==2.94.0.79
nose==1.3.7 # via pylons
ofs==0.4.2
ordereddict==1.1
Expand Down