Merge branch 'archweb-generic'

10 files changed, 228 insertions, 17 deletions

diff --git a/templates/mirrors/mirrorlist_generate.html b/templates/mirrors/mirrorlist_generate.html
index c2a79fa8..7501a9af 100644
--- a/templates/mirrors/mirrorlist_generate.html
+++ b/templates/mirrors/mirrorlist_generate.html
@@ -30,7 +30,7 @@
 
     <p>The following form can generate a custom up-to-date
     <a href="{% wiki_url 'Pacman' %}"
-        title="{{BRANDING_WIKINAME}}: Pacman">pacman</a> mirrorlist based on geography and
+        title="{{ BRANDING_WIKINAME }}: Pacman">pacman</a> mirrorlist based on geography and
     desired protocol(s).  Simply replace the contents of
     <code>/etc/pacman.d/mirrorlist</code> with your generated list.
     Additionally, the mirror status data can be incorporated into the generated
diff --git a/templates/news/list.html b/templates/news/list.html
index 8662a91b..7bc65721 100644
--- a/templates/news/list.html
+++ b/templates/news/list.html
@@ -4,7 +4,7 @@
 {% block title %}{{ BRANDING_DISTRONAME }} - News{% endblock %}
 
 {% block head %}
-<link rel="alternate" type="application/rss+xml" title="{{BRANDING_DISTRONAME}} News Updates" href="/feeds/news/" />
+<link rel="alternate" type="application/rss+xml" title="{{ BRANDING_DISTRONAME }} News Updates" href="/feeds/news/" />
 {% endblock %}
 
 {% block content %}
diff --git a/templates/packages/opensearch.xml b/templates/packages/opensearch.xml
index 0004b996..4c0f9acf 100644
--- a/templates/packages/opensearch.xml
+++ b/templates/packages/opensearch.xml
@@ -1,9 +1,9 @@
 {% load static from staticfiles %}<?xml version="1.0" encoding="UTF-8"?>
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-	<ShortName>{{BRANDING_SHORTNAME}} Packages</ShortName>
-	<LongName>{{BRANDING_DISTRONAME}} Package Repository Search</LongName>
-	<Description>Search the {{BRANDING_DISTRONAME}} package repositories by keyword in package names and descriptions.</Description>
-	<Tags>{{BRANDING_OSEARCH_TAGS}}</Tags>
+	<ShortName>{{ BRANDING_SHORTNAME }} Packages</ShortName>
+	<LongName>{{ BRANDING_DISTRONAME }} Package Repository Search</LongName>
+	<Description>Search the {{ BRANDING_DISTRONAME }} package repositories by keyword in package names and descriptions.</Description>
+	<Tags>{{ BRANDING_OSEARCH_TAGS }}</Tags>
 	<Image height="16" width="16" type="image/x-icon">{{ domain }}{% static "favicon.ico" %}</Image>
 	<Image height="64" width="64" type="image/png">{{ domain }}{% static "logos/icon-transparent-64x64.png" %}</Image>
 	<Language>en-us</Language>
diff --git a/templates/packages/search.html b/templates/packages/search.html
index 41e36193..eccf802c 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -7,7 +7,7 @@
 
 {% block head %}
 {% if is_paginated and page_obj.number > 1 %}<meta name="robots" content="noindex, nofollow"/>{% endif %}
-<link rel="alternate" type="application/rss+xml" title="{{BRANDING_DISTRONAME}} Package Updates" href="/feeds/packages/" />
+<link rel="alternate" type="application/rss+xml" title="{{ BRANDING_DISTRONAME }} Package Updates" href="/feeds/packages/" />
 {% endblock %}
 
 {% block content %}
diff --git a/templates/public/feeds.html b/templates/public/feeds.html
index 70d8eee6..ed2e3964 100644
--- a/templates/public/feeds.html
+++ b/templates/public/feeds.html
@@ -12,8 +12,8 @@
 
     <h3>News and Activity Feeds</h3>
 
-    <p>Grab the <a href="/feeds/news/" class="rss" title="{{BRANDING_DISTRONAME}} news feed">news item feed</a>
-    to keep up-to-date with the latest news from the {{BRANDING_DISTRONAME}} development staff.</p>
+    <p>Grab the <a href="/feeds/news/" class="rss" title="{{ BRANDING_DISTRONAME }} news feed">news item feed</a>
+    to keep up-to-date with the latest news from the {{ BRANDING_DISTRONAME }} development staff.</p>
 
     <p>The <a href="{% wiki_url 'Special:RecentChanges?feed=rss' %}"
     title="{{ BRANDING_WIKINAME }} Recent Changes feed" class="rss">{{ BRANDING_WIKINAME }}: Recent changes feed</a>
@@ -64,13 +64,13 @@
 
     <h3>Release Feed</h3>
 
-    <p>Grab the <a href="/feeds/releases/" class="rss" title="{{BRANDING_DISTRONAME}} release feed">ISO release feed</a>
+    <p>Grab the <a href="/feeds/releases/" class="rss" title="{{ BRANDING_DISTRONAME }} release feed">ISO release feed</a>
     if you want to help seed the ISO release torrents as they come out.</p>
 
     <h3>Development Feeds</h3>
 
     <p>Subscribe to any of the following to track bug tickets and feature
-    requests from the <a href="{{BUGTRACKER_URL}}" title="{{BRANDING_DISTRONAME}} Bugs">{{BRANDING_DISTRONAME}} Bugtracker</a>:</p>
+    requests from the <a href="{{ BUGTRACKER_URL }}" title="{{ BRANDING_DISTRONAME }} Bugs">{{ BRANDING_DISTRONAME }} Bugtracker</a>:</p>
 
     <table class="pretty2">
         <thead>
diff --git a/templates/public/index.html b/templates/public/index.html
index 12c01fbc..953453b8 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -27,10 +27,10 @@
 
     <p>Our community is friendly and helpful.  Please hop on
     <a href="irc://chat.freenode.net#parabola">IRC channel</a> and check out our
-    <a href="https://lists.parabola.nu/mailman/listinfo/">mailing
+    <a href="{{ MAILMAN_BASE_URL }}/mailman/listinfo/">mailing
     lists</a> to get your feet wet. Also glance through our
-    <a href="https://wiki.parabola.nu/">wiki</a> if you want to learn
-    more about Parabola.</p>
+    <a href="{{ BRANDING_WIKINAME }}">wiki</a>
+    if you want to learn more about {{ BRANDING_SHORTNAME }}.</p>
 
     <p class="readmore"><a href="{% url 'page-about' %}"
         title="Learn more about {{ BRANDING_DISTRONAME }}">Learn more...</a></p>
@@ -163,7 +163,7 @@
     <h4>Development</h4>
     <ul>
         <li><a href="{{ PROJECTS_URL }}"
-            title="Official {{BRANDING_SHORTNAME}} projects (git)">Projects in Git</a></li>
+            title="Official {{ BRANDING_SHORTNAME }} projects (git)">Projects in Git</a></li>
 {% comment %}
         <li><a href="{% url 'page-svn' %}"
             title="View SVN entries for packages">SVN Repositories</a></li>
diff --git a/templates/public/userlist.html b/templates/public/userlist.html
index d49a1539..dffd0a17 100644
--- a/templates/public/userlist.html
+++ b/templates/public/userlist.html
@@ -9,7 +9,7 @@
 {% block content %}
 {% cache 600 dev-tu-profiles group.name %}
 <div id="dev-tu-profiles" class="box">
-    <h2>{{BRANDING_DISTRONAME}} {{ group.name }}</h2>
+    <h2>{{ BRANDING_DISTRONAME }} {{ group.name }}</h2>
 
     <p>{{ group.description }}</p>
 
diff --git a/templates/releng/archlinux.ipxe b/templates/releng/archlinux.ipxe
new file mode 100644
index 00000000..4945868c
--- /dev/null
+++ b/templates/releng/archlinux.ipxe
@@ -0,0 +1,157 @@
+#!ipxe
+{% regroup mirrorurls by country as mirrors_by_country %}
+
+# Figure out if client is 64-bit capable
+cpuid --ext 29 && set cpuarch x86_64 || set cpuarch i686
+
+# allow only trusted images
+imgtrust
+
+# initial options
+set bootarch ${cpuarch}
+set release {{ releases.0 }}
+set mirrorurl
+set extrabootoptions ip=dhcp net.ifnames=0
+set countrycode
+
+:main
+menu Arch Linux Netboot
+item --gap Settings
+item set_architecture Architecture: ${bootarch}
+item set_release Release: ${release}
+isset ${mirrorurl} && item set_mirror Mirror: ${mirrorurl} || item set_mirror Choose a mirror
+item set_options Boot options: ${extrabootoptions}
+item
+isset ${mirrorurl} && item boot Boot Arch Linux || item --gap Boot Arch Linux
+item shell Drop to iPXE shell
+item reboot Reboot
+item exit Exit iPXE
+isset ${mirrorurl} && choose --default set_options selected || choose --default set_mirror selected || goto shell
+goto ${selected} || goto main
+
+:shell
+echo Type 'exit' to get the back to the menu
+shell
+goto main
+
+:reboot
+reboot
+
+:exit
+exit
+
+:set_architecture
+menu Arch Linux Netboot: Select Architecture
+item back back
+item
+item --gap Available architectures:
+iseq ${cpuarch} x86_64 && item x86_64 x64_64 ||
+item i686 i686
+choose selected || goto main
+iseq ${selected} back && goto main ||
+set bootarch ${selected}
+goto main
+
+:set_release
+menu Arch Linux Netboot: Select Release
+item back back
+item
+item --gap Available releases:
+{% for release in releases %}item {{ release }} {{ release }}
+{% endfor %}
+choose selected || goto main
+iseq ${selected} back && goto main ||
+set release ${selected}
+goto main
+
+:set_mirror
+goto select_mirror_country
+
+:select_mirror_country
+menu Arch Linux Netboot: Select Mirror
+item back back
+item
+item --gap Custom Configuration:
+item custom Enter mirror URL
+item
+item --gap Select Mirror By Country:
+{% for mirrorgroup in mirrors_by_country %}
+{% if mirrorgroup.grouper == '' %}
+item 00 Global
+{% else %}
+item {{ mirrorgroup.grouper }} {{ mirrorgroup.grouper.name }}
+{% endif %}
+{% endfor %}
+isset ${countrycode} && choose --default ${countrycode} selected || choose selected || goto main
+iseq ${selected} back && goto main ||
+iseq ${selected} custom && goto enter_mirror_url ||
+set countrycode ${selected}
+goto select_mirror_url
+
+:enter_mirror_url
+set countrycode
+echo Enter the mirror URL including the trailing slash.
+echo Example: http://some.host/archlinux/
+echo
+echo -n Mirror URL: ${} && read mirrorurl || goto select_mirror_country
+goto main
+
+:select_mirror_url
+goto select_mirror_url_${countrycode} || goto select_mirror_country
+
+{% for mirrorgroup in mirrors_by_country %}
+{% if mirrorgroup.grouper == '' %}
+:select_mirror_url_00
+set countryname Global
+{% else %}
+:select_mirror_url_{{ mirrorgroup.grouper }}
+set countryname {{ mirrorgroup.grouper.name }}
+{% endif %}
+menu Arch Linux Netboot: Select Mirror
+item back back
+item
+item --gap Available mirrors in ${countryname}
+{% for mirror in mirrorgroup.list %}item {{ mirror.url }} {{ mirror.mirror.name }}
+{% endfor %}
+choose selected || goto select_mirror_country
+iseq ${selected} back && goto select_mirror_country ||
+set mirrorurl ${selected}
+goto main
+{% endfor %}
+
+:set_options
+echo -n Boot options: ${} && read extrabootoptions ||
+goto main
+
+:boot
+echo Booting Arch Linux ${bootarch} ${release} from ${mirrorurl}
+echo
+kernel ${mirrorurl}iso/${release}/arch/boot/${bootarch}/vmlinuz || goto failed_download
+imgverify vmlinuz ${mirrorurl}iso/${release}/arch/boot/${bootarch}/vmlinuz.ipxe.sig || goto failed_verify
+initrd ${mirrorurl}iso/${release}/arch/boot/intel_ucode.img || goto failed_download
+imgverify intel_ucode.img ${mirrorurl}iso/${release}/arch/boot/intel_ucode.img.ipxe.sig || goto failed_verify
+initrd ${mirrorurl}iso/${release}/arch/boot/${bootarch}/archiso.img || goto failed_download
+imgverify archiso.img ${mirrorurl}iso/${release}/arch/boot/${bootarch}/archiso.img.ipxe.sig || goto failed_verify
+imgargs vmlinuz initrd=intel_ucode.img initrd=archiso.img archiso_http_srv=${mirrorurl}iso/${release}/ archisobasedir=arch verify=y ${extrabootoptions}
+boot || goto failed_boot
+
+:failed_download
+echo
+echo Failed to download a file.
+goto failed
+
+:failed_verify
+echo
+echo Failed to verify a file.
+goto failed
+
+:failed_boot
+echo
+echo Boot failed.
+goto failed
+
+:failed
+echo Press a key to return to the menu.
+prompt
+imgfree
+goto main
diff --git a/templates/releng/netboot.html b/templates/releng/netboot.html
new file mode 100644
index 00000000..36404588
--- /dev/null
+++ b/templates/releng/netboot.html
@@ -0,0 +1,54 @@
+{% extends "base.html" %}
+{% load staticfiles %}
+
+{% block title %}Arch Linux - Netboot{% endblock %}
+
+{% block content %}
+<div id="arch-netboot" class="box">
+
+<h2>Arch Linux Netboot</h2>
+
+<h3>About Netboot</h3>
+
+<p>Netboot images are small (&lt;1MB) images that can be used to download the latest Arch Linux release on the fly upon system boot.
+It is unnecessary to update the netboot image, the newest release will be available automatically.</p>
+
+<p>Netboot uses customized <a href="http://ipxe.org">iPXE</a> builds.
+The Linux kernel, initramfs and squashfs files for the live system are downloaded from an Arch Linux mirror.
+The integrity of all downloaded files is verified with cryptographic signatures.</p>
+
+<h3>Requirements</h3>
+
+<p>To use netboot, the following requirements must be met:
+
+<ul>
+<li>Wired (ethernet) internet connection with DHCP autoconfiguration</li>
+<li>Sufficient memory to store and run the live system</li>
+</ul>
+
+</p>
+
+<h3>Download</h3>
+
+<h4>BIOS</h4>
+
+<ul>
+<li><a href="{% static "netboot/ipxe.lkrn" %}">ipxe.lkrn</a> (<a href="{% static "netboot/ipxe.lkrn.sig" %}">PGP signature</a>) - Linux kernel-like image that can be started with any Linux bootloader</li>
+<li><a href="{% static "netboot/ipxe.pxe" %}">ipxe.pxe</a> (<a href="{% static "netboot/ipxe.pxe.sig" %}">PGP signature</a>) - PXE image for chainloading from a PXE environment</li>
+</ul>
+
+<h4>UEFI</h4>
+
+<ul>
+<li><a href="{% static "netboot/ipxe.efi" %}">ipxe.efi</a> (<a href="{% static "netboot/ipxe.efi.sig" %}">PGP signature</a>) - x86_64 UEFI executable</li>
+</ul>
+
+<p>You can build your own iPXE images compatible with netboot.
+For details, check out the <a href="https://aur.archlinux.org/packages/ipxe-netboot">ipxe-netboot AUR package</a>.</p>
+
+<h3>More information</h3>
+
+<p>For detailed usage instructions, check out the <a href="https://wiki.archlinux.org/index.php/Netboot">netboot wiki page</a>.
+
+</div>
+{% endblock %}
diff --git a/templates/releng/release_list.html b/templates/releng/release_list.html
index 0f1e6e1c..2339dbfe 100644
--- a/templates/releng/release_list.html
+++ b/templates/releng/release_list.html
@@ -5,7 +5,7 @@
 {% block title %}{{ BRANDING_DISTRONAME }} - Releases{% endblock %}
 
 {% block head %}
-<link rel="alternate" type="application/rss+xml" title="{{BRANDING_DISTRONAME}} News Updates" href="/feeds/releases/" />
+<link rel="alternate" type="application/rss+xml" title="{{ BRANDING_DISTRONAME }} News Updates" href="/feeds/releases/" />
 {% endblock %}
 
 {% block content %}