From 2b89b40cf889ebaec8cd2e26ab762c981c32d54a Mon Sep 17 00:00:00 2001
From: Angel Velasquez <angvp@archlinux.org>
Date: Fri, 22 Apr 2016 01:30:28 -0300
Subject: Add link to unixstickers on the index

Signed-off-by: Angel Velasquez <angvp@archlinux.org>
---
 templates/public/index.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/public/index.html b/templates/public/index.html
index c78303ce..5fc4833a 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -136,6 +136,8 @@
             title="USB keys, jewellery, case badges">Arch Schwag</a></li>
         <li><a href="http://www.zazzle.com/archlinux*"
             title="T-shirts, mugs, mouse pads, hoodies, posters, skateboards, shoes, etc.">Products via Zazzle</a></li>
+        <li><a href="http://www.unixstickers.com/tag/archlinux" title="Arch
+        Linux stickers, t-shirts, hoodies, mugs, posters and pins">Products via Unixstickers</li>
         <li><a href="http://www.freewear.org/?page=list_items&amp;org=Archlinux"
             title="T-shirts">T-shirts via Freewear</a></li>
     </ul>
-- 
cgit v1.2.3


From f62ef05d3c325635020e668d12e0aa0df9d6aecd Mon Sep 17 00:00:00 2001
From: Angel Velasquez <angvp@archlinux.org>
Date: Fri, 22 Apr 2016 01:37:40 -0300
Subject: Version bump of the Django version to 1.7.11

Signed-off-by: Angel Velasquez <angvp@archlinux.org>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 6ca63480..8128b451 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 -e git+git://github.com/fredj/cssmin.git@master#egg=cssmin
-Django==1.7.8
+Django==1.7.11
 IPy==0.83
 Jinja2==2.7.3
 Markdown==2.6.2
-- 
cgit v1.2.3


From 1bb1b8f9ad4ea8b8ac64ecee417db960771318b2 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Tue, 17 May 2016 18:00:55 -0400
Subject: archweb.wsgi: try to detect the location automatically

---
 archweb.wsgi | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/archweb.wsgi b/archweb.wsgi
index a0d969e7..20ec463e 100644
--- a/archweb.wsgi
+++ b/archweb.wsgi
@@ -3,10 +3,12 @@ import os
 import sys
 import site
 
-base_path = "/srv/http/archweb"
+base_path = os.path.dirname(os.path.realpath(__file__))
 
-site.addsitedir('/srv/http/archweb-env/lib/python2.7/site-packages')
-sys.path.insert(0, base_path)
+virtualenv_path = os.path.join(base_path, "env")
+if os.path.isdir(virtualenv_path):
+	site.addsitedir(os.path.join(virtualenv_path, 'lib/python2.7/site-packages'))
+	sys.path.insert(0, base_path)
 
 os.environ['DJANGO_SETTINGS_MODULE'] = "settings"
 
-- 
cgit v1.2.3