diff options
Diffstat (limited to 'releng')
| -rw-r--r-- | releng/models.py | 4 | ||||
| -rw-r--r-- | releng/urls.py | 3 | ||||
| -rw-r--r-- | releng/views.py | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/releng/models.py b/releng/models.py index c1a82589..a4af81ab 100644 --- a/releng/models.py +++ b/releng/models.py @@ -139,11 +139,11 @@ class Release(models.Model): return "iso/%s/" % self.version def iso_url(self): - return "iso/%s/archlinux-%s-dual.iso" % (self.version, self.version) + return "iso/%s/%s-%s-dual.iso" % (self.version, settings.BRANDING_SLUG, self.version) def magnet_uri(self): query = [ - ('dn', "archlinux-%s-dual.iso" % self.version), + ('dn', "%s-%s-dual.iso" % (settings.BRANDING_SLUG, self.version)), ] if settings.TORRENT_TRACKERS: query.extend(('tr', uri) for uri in settings.TORRENT_TRACKERS) diff --git a/releng/urls.py b/releng/urls.py index 57013291..2d22e290 100644 --- a/releng/urls.py +++ b/releng/urls.py @@ -1,3 +1,4 @@ +from django.conf import settings from django.conf.urls import include, patterns from .views import ReleaseListView, ReleaseDetailView @@ -23,7 +24,7 @@ releases_patterns = patterns('releng.views', ) netboot_patterns = patterns('releng.views', - (r'^archlinux\.ipxe$', 'netboot_config', {}, 'releng-netboot-config'), + ((r'^%s\.ipxe$' % settings.BRANDING_SLUG), 'netboot_config', {}, 'releng-netboot-config'), (r'^$', 'netboot_info', {}, 'releng-netboot-info') ) diff --git a/releng/views.py b/releng/views.py index b2bafb49..793249fc 100644 --- a/releng/views.py +++ b/releng/views.py @@ -53,7 +53,7 @@ class TestForm(forms.ModelForm): success = forms.BooleanField( help_text="Only check this if everything went fine. " "If you ran into problems please create a ticket on <a " - "href=\"https://bugs.archlinux.org/index.php?project=6\">the " + "href=\""+settings.BUGTRACKER_RELENG_URL+"\">the " "bugtracker</a> (or check that one already exists) and link to " "it in the comments.", required=False) @@ -237,7 +237,7 @@ def release_torrent(request, version): data = b64decode(release.torrent_data.encode('utf-8')) response = HttpResponse(data, content_type='application/x-bittorrent') # TODO: this is duplicated from Release.iso_url() - filename = 'archlinux-%s-dual.iso.torrent' % release.version + filename = '%s-%s-dual.iso.torrent' % (settings.BRANDING_SLUG, release.version) response['Content-Disposition'] = 'attachment; filename=%s' % filename return response |