Use new Parabola URLs.

9 files changed, 25 insertions, 24 deletions

diff --git a/common.mk b/common.mk
index 35f0b3bb..92f26337 100644
--- a/common.mk
+++ b/common.mk
@@ -22,7 +22,7 @@ $(www)/https/%:
 	touch '$@'
 
 $(branding)/%:
-	gitget checkout 'git://projects.parabolagnulinux.org/artwork.git#branch=master' '$(artwork)'
+	gitget checkout 'git://projects.parabola.nu/artwork.git#branch=master' '$(artwork)'
 	make -C '$(branding)'
 
 .PHONY: PHONY
diff --git a/main/templatetags/wiki.py b/main/templatetags/wiki.py
index 4a3b2f83..e3ffb138 100644
--- a/main/templatetags/wiki.py
+++ b/main/templatetags/wiki.py
@@ -4,6 +4,6 @@ register = template.Library()
 @register.simple_tag
 def wiki_url(article=""):
     if article == "":
-        return "https://wiki.parabolagnulinux.org/"
+        return "https://wiki.parabola.nu/"
     else:
-        return "https://wiki.parabolagnulinux.org/"+article.replace(' ', '_')
+        return "https://wiki.parabola.nu/"+article.replace(' ', '_')
diff --git a/packages/templatetags/package_extras.py b/packages/templatetags/package_extras.py
index 70456985..e022116a 100644
--- a/packages/templatetags/package_extras.py
+++ b/packages/templatetags/package_extras.py
@@ -114,13 +114,13 @@ def packager_link(user):
 def scm_link(package, operation):
     parts = ("abslibre", operation, package.repo.name.lower(), package.pkgbase)
     linkbase = (
-        "https://projects.parabolagnulinux.org/%s.git/%s/%s/%s")
+        "https://projects.parabola.nu/%s.git/%s/%s/%s")
     return linkbase % tuple(urlquote(part.encode('utf-8')) for part in parts)
 
 
 @register.simple_tag
 def get_wiki_link(package):
-    url = "https://wiki.parabolagnulinux.org/index.php"
+    url = "https://wiki.parabola.nu/index.php"
     data = {
         'title': "Special:Search",
         'search': package.pkgname,
@@ -129,11 +129,11 @@ def get_wiki_link(package):
 
 @register.simple_tag
 def bugs_list(package):
-    url = "https://labs.parabola.nu/search/index/"
     if package.arch.name == 'mips64el':
-        url = url + "mips64el"
+        project = "mips64el"
     else:
-        url = url + "issue-tracker"
+        project = "issue-tracker"
+    url = "https://labs.parabola.nu/projects/%s/search" % project
     data = {
         'titles_only': '1',
         'issues': '1',
@@ -162,6 +162,7 @@ def flag_unfree(package):
     else:
         url = url + "issue-tracker/issues/new"
     data = {
+        'issue[tracker_id]': '4',  # "freedom issue"
         'issue[priority_id]': '1', # "freedom issue"
         'issue[watcher_user_ids][]': '62', # "dev-list"
         'issue[subject]': '[%s] Please put your reasons here (register first if you haven\'t)' % package.pkgname,
diff --git a/settings.py b/settings.py
index b511d613..074b3749 100644
--- a/settings.py
+++ b/settings.py
@@ -13,7 +13,7 @@ ADMINS = ()
 MANAGERS = ADMINS
 
 # Package out-of-date emails for orphans
-NOTIFICATIONS = ['dev@lists.parabolagnulinux.org']
+NOTIFICATIONS = ['dev@lists.parabola.nu']
 
 # Full path to the data directory
 DEPLOY_PATH = os.path.dirname(os.path.realpath(__file__))
@@ -158,17 +158,17 @@ LOGGING = {
 PGP_SERVER = 'pgp.mit.edu:11371'
 
 # URL to fetch a current list of available ISOs
-ISO_LIST_URL = 'https://repo.parabolagnulinux.org/isos/'
+ISO_LIST_URL = 'https://repo.parabola.nu/iso/'
 
 # URL to the PXE netboot instructions
-PXEBOOT_URL = 'http://repo.parabolagnulinux.org/pxeboot/'
+PXEBOOT_URL = 'https://repo.parabola.nu/pxeboot/'
 
 # URL for SVN access for fetching commit messages (note absence of packages or
 # community bit on the end, repo.svn_root is appended)
 #SVN_BASE_URL = 'svn://svn.archlinux.org/'
 
 # URL for linking to mailing lists
-MAILMAN_BASE_URL = 'https://lists.parabolagnulinux.org/'
+MAILMAN_BASE_URL = 'https://lists.parabola.nu/'
 
 # URL for linking to the bugtracker
 BUGTRACKER_URL = 'https://labs.parabola.nu/'
@@ -177,7 +177,7 @@ BUGTRACKER_URL = 'https://labs.parabola.nu/'
 BUGTRACKER_RELENG_URL = 'https://labs.parabola.nu/projects/isos'
 
 # URL for linking to projects in git
-PROJECTS_URL = 'https://projects.parabolagnulinux.org'
+PROJECTS_URL = 'https://projects.parabola.nu'
 
 # Trackers used for ISO download magnet links
 TORRENT_TRACKERS = (
@@ -186,14 +186,14 @@ TORRENT_TRACKERS = (
     'udp://tracker.istole.it:80',
 )
 
-DOMAIN_RE = r'^(.+\.)?parabolagnulinux.org$'
+DOMAIN_RE = r'^(.+\.)?parabola.nu$'
 
 BRANDING_APPNAME = 'parabolaweb'
 BRANDING_DISTRONAME = 'Parabola GNU/Linux-libre'
 BRANDING_SHORTNAME = 'Parabola'
 BRANDING_SLUG = 'parabola'
 BRANDING_WIKINAME = 'ParabolaWiki'
-BRANDING_EMAIL = 'Parabola Website Notification <nobody@parabolagnulinux.org>'
+BRANDING_EMAIL = 'Parabola Website Notification <nobody@repo.parabola.nu>'
 BRANDING_OSEARCH_TAGS = 'gnu linuxlibre parabola package software'
 
 ## Import local settings
diff --git a/templates/packages/search.html b/templates/packages/search.html
index 074445d8..29dddeb3 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -111,7 +111,7 @@
     <p>You are browsing the {{ BRANDING_DISTRONAME }} package database. From here you can find
     detailed information about packages located in the official supported repositories.
     If you need the sourceball from where a package is built, you can look at our <a
-        href="https://repo.parabolagnulinux.org/sources/packages"
+        href="https://repo.parabola.nu/sources/packages"
         title="Sourceballed packages">sources repo</a>.</p>
 </div>
 {% endblock %}
diff --git a/templates/public/art.html b/templates/public/art.html
index 80c5ac95..32acc172 100644
--- a/templates/public/art.html
+++ b/templates/public/art.html
@@ -10,7 +10,7 @@
     
     <p>You can help by creating artwork for {{ BRANDING_DISTRONAME }}.</p>
 
-    <p>Send your designs to dev@lists.parabolagnulinux.org and state they are CC-by-sa
+    <p>Send your designs to dev@lists.parabola.nu and state they are CC-by-sa
       or another free culture friendly license.</p>
 
 {% comment %}
diff --git a/templates/public/https.html b/templates/public/https.html
index df3e2c73..9d54646a 100644
--- a/templates/public/https.html
+++ b/templates/public/https.html
@@ -11,7 +11,7 @@
     is the <em>only</em> page on the whole site that can be accessed without a
     secure connection, all other pages will redirect to the secure version.</p>
 
-    <h2><a href="https://parabolagnulinux.org">Enter the secure site</a></h2>
+    <h2><a href="https://www.parabola.nu/">Enter the secure site</a></h2>
 
     <h3>But my browser says the secure site is untrusted</h3>
 
@@ -42,7 +42,7 @@
     <h2>I just want to get the installer ISOs</h2>
 
     <p>You can proceed to our
-    <a href="{% wiki_url 'get' %}">ISOs download page</a> on
+    <a href="{% wiki_url 'Get Parabola' %}">ISOs download page</a> on
     <a href="{% wiki_url %}">our wiki</a>.</p>
 
 </div>
diff --git a/templates/public/index.html b/templates/public/index.html
index 6ef6b4bf..64d19e6d 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -28,9 +28,9 @@
 
     <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.parabolagnulinux.org/mailman/listinfo/">mailing
+    <a href="https://lists.parabola.nu/mailman/listinfo/">mailing
     lists</a> to get your feet wet. Also glance through our
-    <a href="https://wiki.parabolagnulinux.org/">wiki</a> if you want to learn
+    <a href="https://wiki.parabola.nu/">wiki</a> if you want to learn
     more about Parabola.</p>
 
     <p class="readmore"><a href="{% url 'page-about' %}"
diff --git a/urls.py b/urls.py
index 04f5ecd2..4bd27ec2 100644
--- a/urls.py
+++ b/urls.py
@@ -104,11 +104,11 @@ legacy_urls = (
     ('^todolists/$',   '/todo/'),
 
     ('^docs/en/guide/install/arch-install-guide.html',
-        'https://wiki.parabolagnulinux.org/Installation_guide'),
+        'https://wiki.parabola.nu/Installation_Guide'),
     ('^docs/en/',
-        'https://wiki.parabolagnulinux.org/'),
+        'https://wiki.parabola.nu/'),
     ('^docs/',
-        'https://wiki.parabolagnulinux.org/'),
+        'https://wiki.parabola.nu/'),
 
 	('^developers/$',   '/hackers/'),
 	('^trustedusers/$',   '/hackers/'),