diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| l--------- | include/python2.7 | 1 | ||||
| -rw-r--r-- | settings.py | 13 | ||||
| -rw-r--r-- | templates/packages/details.html | 9 | ||||
| -rw-r--r-- | templates/public/install.html | 191 | ||||
| -rw-r--r-- | urls.py | 4 |
6 files changed, 6 insertions, 213 deletions
@@ -4,4 +4,3 @@ local_settings.py archweb.db testing/ -.git/ diff --git a/include/python2.7 b/include/python2.7 deleted file mode 120000 index ad4ca80b..00000000 --- a/include/python2.7 +++ /dev/null @@ -1 +0,0 @@ -/usr/include/python2.7
\ No newline at end of file diff --git a/settings.py b/settings.py index 70cfeae2..f98f709c 100644 --- a/settings.py +++ b/settings.py @@ -2,21 +2,19 @@ import os # Django settings for archweb project. ## Set the debug values -DEBUG = True +DEBUG = False TEMPLATE_DEBUG = DEBUG ## Notification admins -# Put yourself here ADMINS = ( - ('Nicolas Reynolds', 'fauno@kiwwwi.com.ar'), + ('Dan McGee', 'dan@archlinux.org'), ) # Set managers to admins MANAGERS = ADMINS # Package out-of-date emails for orphans -# TODO configure email client -NOTIFICATIONS = ['packages@list.parabolagnulinux.org'] +NOTIFICATIONS = ['arch-notifications@archlinux.org'] # Full path to the data directory DEPLOY_PATH = os.path.dirname(os.path.realpath(__file__)) @@ -35,7 +33,6 @@ SITE_ID = 1 # If you set this to False, Django will make some optimizations so as not # to load the internationalization machinery. -# TODO work i18n USE_I18N = False # If you set this to False, Django will not format dates, numbers and @@ -91,7 +88,6 @@ TEMPLATE_DIRS = ( # Put strings here, like "/home/html/django_templates". # Always use forward slashes, even on Windows. '%s/templates' % DEPLOY_PATH, - '/usr/lib/python2.7/site-packages/django_git/templates/django_git/' ) TEMPLATE_LOADERS = ( @@ -125,11 +121,8 @@ INSTALLED_APPS = ( 'devel', 'public', 'south', # database migration support - # 'django_git' ) -REPOS_ROOT='/srv/git/projects' - ## Import local settings from local_settings import * diff --git a/templates/packages/details.html b/templates/packages/details.html index f7680593..1721dc56 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -108,13 +108,7 @@ title="Visit the website for {{ pkg.pkgname }}">{{ pkg.url }}</a>{% endif %}</td> </tr><tr> <th>License:</th> - {% if pkg.license = 'GPL' %} - <td><a href="http://www.gnu.org/licenses/gpl.txt">{{ pkg.license }}</a></td> - {% else %}{% if pkg.license = 'GPL3' %} - <td><a href="http://www.gnu.org/licenses/gpl.txt">{{ pkg.license }}</a></td> - {% else %} - <td>{{ pkg.license }}</td> - {% endif %} + <td>{{ pkg.license }}</td> </tr><tr> <th>Groups:</th> {% with pkg.packagegroup_set.all as groups %} @@ -213,7 +207,6 @@ </div><!-- #pkgfiles --> </div><!-- #metadata --> - {% endif %} {% endcache %} </div><!-- #pkgdetails --> diff --git a/templates/public/install.html b/templates/public/install.html deleted file mode 100644 index 8244f971..00000000 --- a/templates/public/install.html +++ /dev/null @@ -1,191 +0,0 @@ -{% extends "base.html" %} -{% load cache %} - -{% block title %}Parabola - Install it!{% endblock %} -{% block navbarclass %}anb-download{% endblock %} - -{% block content %} -<div id="arch-downloads" class="box"> - - <h2>Parabola Downloads</h2> - - {% with "2010.05" as version %} - <h3>Release Info</h3> - - <p>All available images can be burned to a CD, mounted as an ISO file, - or be directly written to a USB stick using a utility like `dd`. These - are intended for new installations only; an existing Parabola system - can always be updated with `pacman -Syu`.</p> - - <ul> - <li><strong>Current Release:</strong> <a href="https://wiki.archlinux.org/index.php/DeveloperWiki:{{ version }}">{{ version }}</a></li> - <li><strong>Included Kernel:</strong> 2.6.33.4</li> - <li><strong>Resources:</strong> - <ul> - <li><a href="https://bugs.archlinux.org/index.php?project=6" - title="Parabola Bugtracker:Release Engineering">Bug Tracker</a></li> - <li><a href="http://mailman.archlinux.org/mailman/listinfo/arch-releng" - title="Parabola Release Engineering mailing list">Mailing List</a></li> - </ul> - </li> - </ul> - - <p><strong>Links and Instructions:</strong></p> - - <ul id="download-help"> - <li><a href="http://www.archlinux.org/iso/{{ version }}/README" - title="Official download instructions">Readme and Instructions</a></li> - <li><a href="https://wiki.archlinux.org/index.php/Official_Arch_Linux_Install_Guide" - title="Official Installation Guide">Arch Linux Install Guide</a></li> - </ul> - - <h3>Existing Arch Users</h3> - <p>If you already have installed Arch, you can easily upgrade to Parabola by - doing several simple things. First, you have to download our own mirrorlist! We - can guarantee that you'll be happy with that.</p> - - <pre><code>pacman -U - http://repo.parabolagnulinux.org/free/core/os/any/pacman-mirrorlist-libre-20101017-1-any.pkg.tar.gz</code></pre> - - <p>It is also proposed that you clean up your package cache, so that your - old packages don't get mixed up with the Parabola ones. It's as easy as - <pre><code>pacman -Scc</code></pre>.</p> - - <p>Next step is to force pacman to update the databases. You may already - know that, but if you don't, all you have to do is <pre><code>pacman - -Syy</code></pre>.</p> - - </p>At this point, you have to install the libre kernel. Easy step, thanks - to pacman: <pre><code>pacman -Sf kernel26</code></pre>. Oh, don't forget the - headers! <pre><code>pacman -Sf kernel26-headers</code></pre>.</p> - - <p>It seems like the only thing remaining is a <pre><code>pacman - -Suu</code></pre>. Reboot and say hello to your brand new Parabola - system!</p> - - <h3>BitTorrent Download (recommended)</h3> - - <p>If you can spare the bytes, please leave the client open after your - download is finished, so you can seed it back to others. - <em>A web-seed capable client is recommended for fastest download speeds.</em></p> - - <table id="download-torrents" class="pretty1"> - <thead> - <tr> - <th>Format</th> - <th class="cpu-arch">i686 CPU</th> - <th class="cpu-arch">x86-64 CPU</th> - <th>Description</th> - </tr> - </thead> - <tbody> - <tr> - <td> - Netinstall Image - </td><td class="cpu-arch"> - <a - href="http://repo.parabolagnulinux.org/isos/i686/parabola-{{version}}-core-i686.torrent" - title="Download for i686 architecture">Download</a> - </td><td class="cpu-arch"> - <a - href="http://repo.parabolagnulinux.org/isos/i/parabola-2010.09.30-core-i686.torrent" - title="Download for x86-64 architecture">Download</a> - </td><td class="cpu-arch"> - <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-netinstall-dual.iso.torrent" - title="Download for both architectures">Download</a> - </td><td class="wrap"> - Downloads and installs packages versions via FTP for absolute freshness. - </td> - </tr><tr> - <td> - Core Image - </td><td class="cpu-arch"> - <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-core-i686.iso.torrent" - title="Download for i686 architecture">Download</a> - </td><td class="cpu-arch"> - <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-core-x86_64.iso.torrent" - title="Download for x86-64 architecture">Download</a> - </td><td class="cpu-arch"> - <a href="http://www.archlinux.org/iso/{{version}}/archlinux-{{version}}-core-dual.iso.torrent" - title="Download for both architectures">Download</a> - </td><td class="wrap"> - Core packages are included on the media. Good for basic off-line installation. - </td> - </tr> - </tbody> - </table> - -{% comment %} - <h3>Get Parabola on CD</h3> - -<!-- we should seek for a service provider like this --> - - <p>The following suppliers donate a portion of their proceeds to the - Parabola project:</p> - - <ul id="cd-vendors-donate"> - <li><a href="http://www.osdisc.com/cgi-bin/view.cgi/products/linux/arch?affiliate=archlinux" - title="Purchase a CD from OSDisc">Purchase a CD from OSDisc</a></li> - <li><a href="http://www.shoplinuxonline.com/index.php?main_page=index&cPath=1_46&zenid=ecd15b48affe8976130bc575c1276ee4" - title="Purchase a CD from Shop Linux Online">Purchase a CD from Shop Linux Online</a></li> - </ul> - - <p>Parabola CDs are also available for purchase from these suppliers:</p> - - <ul id="cd-vendors"> - <li><a href="http://www.linuxcd.org/view_distro.php?id_distro=48" - title="Purchase a CD from LinuxCD">Purchase a CD from LinuxCD</a></li> - </ul> -{% endcomment %} - - <h3>HTTP/FTP Direct Downloads</h3> - - <p>In addition to the BitTorrent links above, install images can also be - downloaded via HTTP or FTP from the mirror sites listed below. Please - ensure the download image matches the checksum from the md5sums.txt or - sha1sums.txt file in the same directory as the image.</p> - - <h4>Checksums</h4> - - <p>File integrity checksums for the latest releases can be found below:</p> - - <ul> - <li><a href="http://www.archlinux.org/iso/{{version}}/sha1sums.txt" - title="Get the latest SHA1 checksums">SHA1 checksums</a></li> - <li><a href="http://www.archlinux.org/iso/{{version}}/md5sums.txt" - title="Get the latest MD5 checksums">MD5 checksums</a></li> - </ul> - {% endwith %} - - {% cache 600 download-mirrors %} - <table id="download-mirrors"> - <thead> - <tr> - <th><h4>Server Location</h4></th> - <th><h4>Download</h4></th> - </tr> - </thead> - <tbody> - <tr><td colspan="2"> - {% for mirror_url in mirror_url_list %} - {% ifchanged mirror_url.mirror.country %} - </td></tr> - <tr><td class="mirror-country" colspan="2"><strong>{{mirror_url.mirror.country}}</strong> - {% endifchanged %} - {% ifchanged mirror_url.mirror.name %} - </td></tr> - <tr><td class="mirror-server">{{mirror_url.mirror.name}}</td><td> - {% endifchanged %} - <a href="{{mirror_url.url}}iso/" - title="Download from {{mirror_url.url}}iso/">{{mirror_url.protocol.protocol|upper}}</a> - {% endfor %} - </td></tr> - </tbody> - </table> - {% endcache %} - - <p>If you want to become an Official Parabola Mirror please follow the - instructions listed <a href="https://wiki.archlinux.org/index.php/DeveloperWiki:NewMirrors">here</a>.</p> - -</div> -{% endblock %} @@ -120,13 +120,13 @@ urlpatterns = patterns('', (r'^hackers/$', 'public.views.userlist', { 'type':'Hackers' }, 'page-devs'), (r'^fellows/$', 'public.views.userlist', { 'type':'Fellows' }, 'page-fellows'), (r'^donate/$', 'public.views.donate', {}, 'page-donate'), -# (r'^install/$', 'public.views.install', {}, 'page-install'), + (r'^download/$', 'public.views.download', {}, 'page-download'), (r'^opensearch/packages/$', 'packages.views.opensearch', {}, 'opensearch-packages'), # Some django internals we use (r'^jsi18n/$', 'django.views.i18n.null_javascript_catalog'), # Static content - (r'^media/(.*)$', 'django.views.static.serve', {'document_root': settings.DEPLOY_PATH+'/media'}), + (r'^media/(.*)$', 'django.views.static.serve', {'document_root': settings.DEPLOY_PATH+'/media'}) ) # vim: set ts=4 sw=4 et: |