fix things

4 files changed, 14 insertions, 12 deletions

diff --git a/.gitignore b/.gitignore
index a8b709a1..109f07ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,9 @@
 local_settings.py
 archweb.db
 archweb.db-*
+tags
 collected_static/
 testing/
+env/
 repos/
-lib/
+uploads/
diff --git a/local_settings.py.example b/local_settings.py.example
index e5988c8d..c18a83d5 100644
--- a/local_settings.py.example
+++ b/local_settings.py.example
@@ -65,10 +65,10 @@ CACHE_MIDDLEWARE_SECONDS = 300
 SESSION_COOKIE_SECURE = False
 
 ## location for saving dev pictures
-MEDIA_ROOT = '/srv/http/media/devs/'
+MEDIA_ROOT = '/srv/http/web/collected_static/devs'
 
 ## web url for serving image files
-MEDIA_URL = '/media/'
+MEDIA_URL = '/static/devs/'
 
 ## Make this unique, and don't share it with anybody.
 SECRET_KEY = '00000000000000000000000000000000000000000000000'
diff --git a/templates/public/art.html b/templates/public/art.html
index 3a92b8b4..08acf764 100644
--- a/templates/public/art.html
+++ b/templates/public/art.html
@@ -25,12 +25,12 @@
 {% comment %}
 <!-- This is an example of how images should be added here -->
     <em>Also available in print-quality
-        <a href="{% cdnprefix %}/media/logos/parabola-logo-dark-1200dpi.png"
+        <a href="{{ STATIC_URL }}logos/parabola-logo-dark-1200dpi.png"
             title="Download 1200dpi PNG format">PNG</a> and scalable
-        <a href="{% cdnprefix %}/media/logos/parabola-logo-dark-scalable.svg"
+        <a href="{{ STATIC_URL }}logos/parabola-logo-dark-scalable.svg"
             title="Download scalable SVG format">SVG</a> formats.</em></p>
 
-    <img src="{% cdnprefix %}/media/logos/parabola-logo-dark-90dpi.png"
+    <img src="{{ STATIC_URL }}logos/parabola-logo-dark-90dpi.png"
     alt="Parabola PNG logo @ 90dpi" title="Parabola PNG logo @ 90dpi" />
 
     <p><strong>Two-color inverted version</strong> (for dark backgrounds)<br />
diff --git a/templates/public/index.html b/templates/public/index.html
index 0ecea0e2..2cfec9e2 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -39,7 +39,7 @@
     </h3>
 
     <a href="/feeds/news/" title="Parabola News RSS Feed"
-        class="rss-icon"><img src="{% cdnprefix %}/media/rss.png" alt="RSS Feed" /></a>
+        class="rss-icon"><img src="{{ STATIC_URL }}rss.png" alt="RSS Feed" /></a>
 
     {% for news in news_updates %}
     {% if forloop.counter0 < 5 %}
@@ -92,7 +92,7 @@
             title="Browse all of the latest packages">more</a>)</span></h3>
 
     <a href="/feeds/packages/" title="Parabola Package Updates RSS Feed"
-        class="rss-icon"><img src="{% cdnprefix %}/media/rss.png" alt="RSS Feed" /></a>
+        class="rss-icon"><img src="{{ STATIC_URL }}rss.png" alt="RSS Feed" /></a>
 
     <table>
         {% for update in pkg_updates %}
@@ -186,23 +186,23 @@
 
 <div id="arch-sponsors" class="widget">
     <a href="http://gnuchile.org">
-    <img src="{% cdnprefix %}/media/gnuchile.png"
+    <img src="{{ STATIC_URL }}gnuchile.png"
     alt="GNU Chile - Donates the .org domain"
     title="GNU Chile - Donates the .org domain" />
     </a>
 
     <a href="http://venenux.org">
-    <img src="{% cdnprefix %}/media/venenux.png"
+    <img src="{{ STATIC_URL }}venenux.png"
     alt="Venenux GNU/Linux - Donates the repo, wiki and lists hosting"
     title="Venenux GNU/Linux - Donates the repo, wiki and lists hosting" />
     </a>
 
-    <img src="{% cdnprefix %}/media/naltu.png"
+    <img src="{{ STATIC_URL }}naltu.png"
     alt="Naltú - Donates the website, bugs, projects and ABSLibre hosting"
     title="Naltú - Donates the website, bugs, projects and ABSLibre hosting" />
 
     <a href="http://freedomincluded.com">
-    <img src="{% cdnprefix %}/media/freedomincluded.png"
+    <img src="{{ STATIC_URL }}freedomincluded.png"
     alt="Freedom Included - Donated Lemote Yeeloongs to port Parabola to the MIPS architecture"
     title="Freedom Included - Donated Lemote Yeeloongs to port Parabola to the MIPS architecture" />
     </a>