Skip to content

Commit

Permalink
Minor cleanup (#109)
Browse files Browse the repository at this point in the history
* Adds DCO_1_1.md

* Makes admin URL dynamic
  • Loading branch information
Chris Houseknecht authored Oct 27, 2017
1 parent 48cd970 commit 8cc0787
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 1 deletion.
46 changes: 46 additions & 0 deletions DCO_1_1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
DCO
===

All contributors must use `git commit --signoff` for any
commit to be merged, and agree that usage of --signoff constitutes
agreement with the terms of DCO 1.1, which appears below:

```
Developer Certificate of Origin
Version 1.1
Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129
Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.
Developer's Certificate of Origin 1.1
By making a contribution to this project, I certify that:
(a) The contribution was created in whole or in part by me and I
have the right to submit it under the open source license
indicated in the file; or
(b) The contribution is based upon previous work that, to the best
of my knowledge, is covered under an appropriate open source
license and I have the right under that license to submit that
work with modifications, whether created in whole or in part
by me, under the same open source license (unless I am
permitted to submit under a different license), as indicated
in the file; or
(c) The contribution was provided directly to me by some other
person who certified (a), (b) or (c) and I have not modified
it.
(d) I understand and agree that this project and the contribution
are public and that a record of the contribution (including all
personal information I submit with it, including my sign-off) is
maintained indefinitely and may be redistributed consistent with
this project or the open source license(s) involved.
```

3 changes: 3 additions & 0 deletions galaxy/settings/development.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,3 +126,6 @@
{'host': 'memcache', 'port': 11211},
{'host': 'elastic', 'port': 9200}
]

ADMIN_URL_PATTERN = r'^admin/'

3 changes: 3 additions & 0 deletions galaxy/settings/production.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
* GALAXY_RABBITMQ_PORT
* GALAXY_RABBITMQ_USER
* GALAXY_RABBITMQ_PASSWORD
* GALAXY_ADMIN_PATH
"""

import os
Expand Down Expand Up @@ -240,6 +241,8 @@ def _include_settings(filename, scope=None, optional=False):
}
]

ADMIN_URL_PATTERN = r'^%s/' % os.environ.get('GALAXY_ADMIN_PATH', 'admin')

# =========================================================
# Logging
# =========================================================
Expand Down
2 changes: 1 addition & 1 deletion galaxy/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
url(r'^api/', include('galaxy.api.urls', namespace='api', app_name='api')),
url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
# url(r'^avatar/', include('avatar.urls')),
url(r'^galaxy__admin__site/', include(admin.site.urls)),
url(settings.ADMIN_URL_PATTERN, include(admin.site.urls)),
url(r'^robots\.txt$', TemplateView.as_view(template_name="robots.txt", content_type='text/plain')),
url(r'', include('galaxy.main.urls', namespace='main', app_name='main')),
)
Expand Down

0 comments on commit 8cc0787

Please sign in to comment.