diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-11 17:23:42 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-11 17:23:42 -0500 |
| commit | 58fc4756e9822d39f224a8773209e306349146e0 (patch) | |
| tree | d326c593a6b859c8344410778c9e5cd3df436ebf /releng/urls.py | |
| parent | 2f35bd492629a52f4849c379f02030c1efb2495c (diff) | |
| parent | 422aaee026c57b65dda81b78b6a0f49263c6dd1e (diff) | |
Merge branch 'archweb-generic'lukeshu/netboot
# Conflicts:
# AUTHORS
# Makefile
# public/views.py
# settings.py
# templates/public/donate.html
# templates/public/download.html
# templates/public/index.html
Diffstat (limited to 'releng/urls.py')
| -rw-r--r-- | releng/urls.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/releng/urls.py b/releng/urls.py index ca76eb25..57013291 100644 --- a/releng/urls.py +++ b/releng/urls.py @@ -22,9 +22,15 @@ releases_patterns = patterns('releng.views', 'release_torrent', {}, 'releng-release-torrent'), ) +netboot_patterns = patterns('releng.views', + (r'^archlinux\.ipxe$', 'netboot_config', {}, 'releng-netboot-config'), + (r'^$', 'netboot_info', {}, 'releng-netboot-info') +) + urlpatterns = patterns('', (r'^feedback/', include(feedback_patterns)), (r'^releases/', include(releases_patterns)), + (r'^netboot/', include(netboot_patterns)), ) # vim: set ts=4 sw=4 et: |